diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..681f41a --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,116 @@ + + + + + + + +
+ + + + xmlns:android + + ^$ + + + +
+
+ + + + xmlns:.* + + ^$ + + + BY_NAME + +
+
+ + + + .*:id + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + .*:name + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + name + + ^$ + + + +
+
+ + + + style + + ^$ + + + +
+
+ + + + .* + + ^$ + + + BY_NAME + +
+
+ + + + .* + + http://schemas.android.com/apk/res/android + + + ANDROID_ATTRIBUTE_ORDER + +
+
+ + + + .* + + .* + + + BY_NAME + +
+
+
+
+
+
\ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index a92b002..cc65a36 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,10 +2,10 @@ - - - - + + + + \ No newline at end of file diff --git a/build.gradle b/build.gradle index 458d06a..1626bd7 100644 --- a/build.gradle +++ b/build.gradle @@ -2,12 +2,18 @@ buildscript { repositories { + maven { url 'https://maven.aliyun.com/repository/central' } + maven { url 'https://maven.aliyun.com/repository/google' } + maven { url 'https://maven.aliyun.com/repository/gradle-plugin' } + maven { url 'https://maven.aliyun.com/repository/jcenter' } google() + mavenCentral() + maven { url 'https://maven.google.com' } jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.4.2' + classpath 'com.android.tools.build:gradle:3.5.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -16,7 +22,13 @@ buildscript { allprojects { repositories { + maven { url 'https://maven.aliyun.com/repository/central' } + maven { url 'https://maven.aliyun.com/repository/google' } + maven { url 'https://maven.aliyun.com/repository/gradle-plugin' } + maven { url 'https://maven.aliyun.com/repository/jcenter' } google() + mavenCentral() + maven { url 'https://maven.google.com' } jcenter() } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 828c8f8..2e52786 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Aug 13 14:23:14 CST 2019 +#Fri Nov 22 15:17:36 CST 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip diff --git a/imageviewplus/build.gradle b/imageviewplus/build.gradle index 88cb99b..e4fb128 100644 --- a/imageviewplus/build.gradle +++ b/imageviewplus/build.gradle @@ -6,7 +6,7 @@ android { defaultConfig { - minSdkVersion 21 + minSdkVersion 16 targetSdkVersion 29 versionCode 1 versionName "1.0" diff --git a/imageviewplus/src/main/java/com/sailflorve/imageviewplus/view/ImageViewPlus.java b/imageviewplus/src/main/java/com/sailflorve/imageviewplus/view/ImageViewPlus.java index 3c3dc70..88b9d34 100644 --- a/imageviewplus/src/main/java/com/sailflorve/imageviewplus/view/ImageViewPlus.java +++ b/imageviewplus/src/main/java/com/sailflorve/imageviewplus/view/ImageViewPlus.java @@ -29,7 +29,6 @@ import java.util.ArrayList; import java.util.List; - public class ImageViewPlus extends RelativeLayout { private static final String TAG = "CustomImageView"; diff --git a/sample/build.gradle b/sample/build.gradle index 8df52f7..1da6459 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -7,7 +7,7 @@ android { defaultConfig { applicationId "com.sailflorve.turbo.sample" - minSdkVersion 21 + minSdkVersion 16 targetSdkVersion 29 versionCode 1 versionName "1.0"