update gradle's version

imageprocessor · Apr 13, 2018 · a0c82cb · a0c82cb
1 parent 1c1fecb
commit a0c82cb
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 43 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,6 +1,5 @@
 apply plugin: 'com.android.application'
 apply plugin: 'com.hujiang.android-aspectjx'
-apply plugin: 'com.neenbedankt.android-apt'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
@@ -56,9 +55,10 @@ dependencies {
     compile project(':rxcv4j')
 
     compile "com.safframework.log:saf-log:${libs.saf_log}"
-    compile "com.safframework:saf-aop:${libs.saf_aop}"
-    compile "com.safframework.injectview:saf-injectview:${libs.saf_injectview}"
-    apt "com.safframework.injectview:saf-injectview-compiler:${libs.saf_injectview_compiler}"
+    implementation "com.safframework:saf-aop:${libs.saf_aop}"
+    implementation "com.safframework.injectview:saf-injectview:${libs.saf_injectview}"
+    implementation "com.safframework.injectview:saf-injectview-annotation:${libs.saf_injectview_annotation}"
+    annotationProcessor "com.safframework.injectview:saf-injectview-compiler:${libs.saf_injectview_compiler}"
 
     compile "tony-common:tony-common-utils:${libs.tony_common_utils}"
 

diff --git a/build.gradle b/build.gradle
@@ -2,42 +2,44 @@
 ext {
     configuration = [
             package          : "com.cv4j",
-            buildToolsVersion: "25.0.2",
-            compileVersion   : 25,
-            minSdk           : 9,
-            targetSdk        : 25,
+            buildToolsVersion: "27.0.3",
+            compileVersion   : 27,
+            minSdk           : 15,
+            targetSdk        : 27,
             version_code     : 1,
             version_name     : "0.0.1"
     ]
 
     libraries = [
-            supportVersion          : "25.1.1",
+            supportVersion            : "27.0.2",
 
-            rxandroid               : "2.0.1",
-            rxjava                  : "2.1.5",
-            rxbinding               : "2.0.0",
+            rxandroid                 : "2.0.1",
+            rxjava                    : "2.1.12",
+            rxbinding                 : "2.0.0",
 
-            saf_injectview          : "1.1.0",
-            saf_injectview_compiler : "1.1.0",
-            saf_log                 : "1.5.0",
-            saf_aop                 : "1.1.4",
+            saf_injectview            : "1.1.1",
+            saf_injectview_annotation : "1.1.1",
+            saf_injectview_compiler   : "1.1.1",
+            saf_log                   : "1.5.2",
+            saf_aop                   : "1.2.0",
 
-            tony_common_utils       : "1.2.2"
+            tony_common_utils         : "1.2.5"
     ]
 }
 
 buildscript {
     System.properties['com.android.build.gradle.overrideVersionCheck'] = 'true'
-    ext.kotlin_version = '1.1.4'
+    ext.kotlin_version = '1.2.31'
 
     repositories {
+        google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.2'
-        classpath 'com.hujiang.aspectjx:gradle-android-plugin-aspectjx:1.0.10'
-        classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
-        classpath 'com.novoda:bintray-release:0.4.0'
+        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.hujiang.aspectjx:gradle-android-plugin-aspectjx:1.1.1'
+        classpath 'org.aspectj:aspectjtools:1.8.13'
+        classpath 'com.novoda:bintray-release:0.5.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlin_version}"
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -47,6 +49,7 @@ buildscript {
 
 allprojects {
     repositories {
+        google()
         jcenter()
         maven { url 'https://jitpack.io' }
     }
@@ -69,4 +72,6 @@ task clean(type: Delete) {
 //tasks.getByPath(":cv4j:bintrayUpload").enabled = true
 //tasks.getByPath(":rxcv4j:lint").enabled = false
 //tasks.getByPath(":rxcv4j:releaseAndroidJavadocs").enabled = false
-//tasks.getByPath(":rxcv4j:bintrayUpload").enabled = false
+//tasks.getByPath(":rxcv4j:bintrayUpload").enabled = false
+
+tasks.getByPath(":app:transformNativeLibsWithStripDebugSymbolForDebug").enabled = false
diff --git a/cv4j/build.gradle b/cv4j/build.gradle
@@ -1,6 +1,6 @@
 apply plugin: 'com.android.library'
 apply plugin: "findbugs"
-apply plugin: 'checkstyle'
+//apply plugin: 'checkstyle'
 apply plugin: 'com.novoda.bintray-release'
 
 def cfg = rootProject.ext.configuration // 配置
@@ -62,23 +62,23 @@ task findbugs(type: FindBugs,dependsOn:'assembleDebug') {
     }
 }
 
-checkstyle {
-    toolVersion '6.1.1'
-    showViolations true
-}
-
-check.dependsOn 'checkstyle'
-
-task checkstyle(type: Checkstyle) {
-    configFile rootProject.file('checkstyle.xml')
-    source 'src/main/java'
-    ignoreFailures false
-    showViolations true
-    include '**/*.java'
-    exclude '**/gen/**'
-
-    classpath = files()
-}
+//checkstyle {
+//    toolVersion '6.1.1'
+//    showViolations true
+//}
+//
+//check.dependsOn 'checkstyle'
+//
+//task checkstyle(type: Checkstyle) {
+//    configFile rootProject.file('checkstyle.xml')
+//    source 'src/main/java'
+//    ignoreFailures false
+//    showViolations true
+//    include '**/*.java'
+//    exclude '**/gen/**'
+//
+//    classpath = files()
+//}
 
 repositories {
     jcenter()

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Aug 13 14:38:57 CST 2017
+#Fri Apr 13 17:19:22 CST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip