diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 96cc43e..61a9130 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,22 +1,6 @@ - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index f05a1d5..9d0d2a8 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -4,7 +4,7 @@ \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index b4e3402..c7affdb 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -5,7 +5,7 @@ - + diff --git a/.idea/modules.xml b/.idea/modules.xml index 754d518..db1daf7 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -3,10 +3,8 @@ - - - - + + \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml deleted file mode 100644 index 7f68460..0000000 --- a/.idea/runConfigurations.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index e239ee0..e0e393d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,13 +1,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 27 - buildToolsVersion "26.0.1" + compileSdkVersion 28 defaultConfig { applicationId "com.yuyh.imgsel" - minSdkVersion 14 - targetSdkVersion 27 + minSdkVersion 15 + targetSdkVersion 28 versionCode 1 versionName "1.0" } @@ -20,10 +19,8 @@ android { } dependencies { - compile fileTree(include: ['*.jar'], dir: 'libs') - //compile 'com.android.support:appcompat-v7:23.4.0' - // compile project(':library') - compile 'com.yuyh.imgsel:library:2.1.0' + compile project(':library') + // compile 'com.yuyh.imgsel:library:2.1.0' compile 'com.github.bumptech.glide:glide:3.7.0' compile 'com.facebook.fresco:fresco:0.6.0' } diff --git a/build.gradle b/build.gradle index d887439..898c977 100644 --- a/build.gradle +++ b/build.gradle @@ -1,28 +1,30 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. - buildscript { repositories { - jcenter() maven { url 'http://maven.aliyun.com/nexus/content/groups/public/' }//阿里云镜像服务 google() + mavenCentral() + maven { url "https://jitpack.io" } } dependencies { - classpath 'com.android.tools.build:gradle:3.6.3' - classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1' - classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0' - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files + classpath 'com.android.tools.build:gradle:3.4.2' + classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' } } allprojects { repositories { - jcenter() maven { url 'http://maven.aliyun.com/nexus/content/groups/public/' }//阿里云镜像服务 google() + mavenCentral() + maven { url "https://jitpack.io" } + } + + tasks.withType(Javadoc) { + options.addStringOption('Xdoclint:none', '-quiet') + options.addStringOption('encoding', 'UTF-8') } } task clean(type: Delete) { delete rootProject.buildDir -} +} \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 40bdf30..f6159f3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Dec 28 10:00:20 PST 2015 +#Sat Aug 05 17:34:35 CST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-all.zip diff --git a/library/build.gradle b/library/build.gradle index 7096180..54e0f60 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -1,16 +1,16 @@ apply plugin: 'com.android.library' apply plugin: 'com.github.dcendents.android-maven' -apply plugin: 'com.jfrog.bintray' -version = "2.1.0" // 版本号 + +group = 'com.yuyang.library' android { - compileSdkVersion 27 - buildToolsVersion "26.0.1" + compileSdkVersion 28 + resourcePrefix "imgsel" defaultConfig { minSdkVersion 14 - targetSdkVersion 27 + targetSdkVersion 28 versionCode 210 versionName "2.1.0" } @@ -24,77 +24,9 @@ android { dependencies { compile fileTree(include: ['*.jar'], dir: 'libs') - compile 'com.android.support:appcompat-v7:27.1.1' - compile 'com.android.support:support-v4:27.1.1' - compile 'com.android.support:recyclerview-v7:27.1.1' - - compile 'com.yuyh.easyadapter:library:1.1.0' -} + compile 'com.android.support:appcompat-v7:28.0.0' + compile 'com.android.support:support-v4:28.0.0' + compile 'com.android.support:recyclerview-v7:28.0.0' -def siteUrl = 'https://github.com/smuyyh/ImageSelector' -def gitUrl = 'https://github.com/smuyyh/ImageSelector.git' -group = "com.yuyh.imgsel" - -install { - repositories.mavenInstaller { - pom { - project { - packaging 'aar' - name 'Android Image Selector' - url siteUrl - licenses { - license { - name 'The Apache Software License, Version 2.0' - url 'http://www.apache.org/licenses/LICENSE-2.0.txt' - } - } - developers { - developer { - id 'smuyyh' - name 'smuyyh' - email 'smuyyh@gmail.com' - } - } - scm { - connection gitUrl - developerConnection gitUrl - url siteUrl - } - } - } - } -} -task sourcesJar(type: Jar) { - from android.sourceSets.main.java.srcDirs - classifier = 'sources' -} - -task javadoc(type: Javadoc) { - tasks.findByPath(":library:javadoc").enabled = false - options.encoding = "UTF-8" - source = android.sourceSets.main.java.srcDirs - classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) -} -task javadocJar(type: Jar, dependsOn: javadoc) { - classifier = 'javadoc' - from javadoc.destinationDir -} -artifacts { - archives javadocJar - archives sourcesJar -} -Properties properties = new Properties() -properties.load(project.rootProject.file('local.properties').newDataInputStream()) -bintray { - user = properties.getProperty("bintray.user") - key = properties.getProperty("bintray.apikey") - configurations = ['archives'] - pkg { - repo = "maven" // 发布到Maven库 - name = "ImageSelector" // 发布到JCenter上的项目名字 - websiteUrl = siteUrl - vcsUrl = gitUrl - licenses = ["Apache-2.0"] - publish = true - } -} + implementation 'com.github.smuyyh:EasyAdapter:1.3.0' +} \ No newline at end of file diff --git a/library/src/main/java/com/yuyh/library/imgsel/adapter/ImageListAdapter.java b/library/src/main/java/com/yuyh/library/imgsel/adapter/ImageListAdapter.java index 0f3c215..f0fd921 100644 --- a/library/src/main/java/com/yuyh/library/imgsel/adapter/ImageListAdapter.java +++ b/library/src/main/java/com/yuyh/library/imgsel/adapter/ImageListAdapter.java @@ -26,7 +26,7 @@ public class ImageListAdapter extends EasyRVAdapter { private ISListConfig config; private Context context; - private OnItemClickListener listener; + private com.yuyh.library.imgsel.common.OnItemClickListener listener; public ImageListAdapter(Context context, List list, ISListConfig config) { super(context, list, R.layout.item_img_sel, R.layout.item_img_sel_take_photo); @@ -107,7 +107,7 @@ public int getItemViewType(int position) { return 0; } - public void setOnItemClickListener(OnItemClickListener listener) { + public void setOnItemClickListener(com.yuyh.library.imgsel.common.OnItemClickListener listener) { this.listener = listener; } }