Updated advanced-build-version and multitype, etc

danke77 · Oct 14, 2017 · 3a9cfb1 · 3a9cfb1
1 parent dab165c
commit 3a9cfb1
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 32 deletions.
diff --git a/build.gradle b/build.gradle
@@ -7,8 +7,8 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0-beta2'
-        classpath 'org.moallemi.gradle.advanced-build-version:gradle-plugin:1.5.3'
+        classpath 'com.android.tools.build:gradle:3.0.0-beta7'
+        classpath 'org.moallemi.gradle.advanced-build-version:gradle-plugin:1.6.0'
     }
 }
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Aug 22 10:44:41 CST 2017
+#Sat Oct 14 13:04:20 CST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-rc-1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
diff --git a/settings.gradle b/settings.gradle
@@ -6,11 +6,11 @@ include ':transformer'
 
 // project(':multitype').projectDir = new File(rootProject.projectDir, '../MultiType/library')
 
-gradle.ext.supportLibraryVersion = '25.4.0'
+gradle.ext.supportLibraryVersion = '26.1.0'
 gradle.ext.ageraVersion = '1.3.0'
 gradle.ext.leakCanaryVersion = '1.5'
 gradle.ext.crashwoodpeckerVersion = '1.3.2'
-gradle.ext.buildToolsVersion = '26.0.1'
+gradle.ext.buildToolsVersion = '26.0.2'
 
 gradle.allprojects {
     afterEvaluate { project ->

diff --git a/timemachine-store/build.gradle b/timemachine-store/build.gradle
@@ -2,14 +2,14 @@ apply plugin: 'com.android.library'
 apply plugin: 'jacoco'
 
 android {
-    compileSdkVersion 25
+    compileSdkVersion 26
     buildToolsVersion gradle.buildToolsVersion
     resourcePrefix "time_machine"
     defaultPublishConfig "debug"
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 25
+        targetSdkVersion 26
         versionCode 1
         versionName "1.0"
     }

diff --git a/timemachine-widget/build.gradle b/timemachine-widget/build.gradle
@@ -2,14 +2,14 @@ apply plugin: 'com.android.library'
 apply plugin: 'jacoco'
 
 android {
-    compileSdkVersion 25
+    compileSdkVersion 26
     buildToolsVersion gradle.buildToolsVersion
     resourcePrefix "time_machine"
     defaultPublishConfig "debug"
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 25
+        targetSdkVersion 26
         versionCode 1
         versionName "1.0"
     }

diff --git a/timemachine/build.gradle b/timemachine/build.gradle
@@ -2,14 +2,14 @@ apply plugin: 'com.android.library'
 apply plugin: 'jacoco'
 
 android {
-    compileSdkVersion 25
+    compileSdkVersion 26
     buildToolsVersion gradle.buildToolsVersion
     // resourcePrefix "time_machine"
     defaultPublishConfig "debug"
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 25
+        targetSdkVersion 26
         versionCode 20
         versionName "1.0"
     }
@@ -26,6 +26,6 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "com.android.support:appcompat-v7:$gradle.supportLibraryVersion"
     implementation "com.android.support:recyclerview-v7:$gradle.supportLibraryVersion"
-    implementation 'com.google.code.gson:gson:2.8.1'
-    implementation 'me.drakeet.multitype:multitype:3.3.0'
+    implementation 'com.google.code.gson:gson:2.8.2'
+    implementation 'me.drakeet.multitype:multitype:3.3.2'
 }
diff --git a/transformer/build.gradle b/transformer/build.gradle
@@ -1,8 +1,9 @@
+import org.moallemi.gradle.internal.VersionCodeType
+
 apply plugin: 'com.android.application'
-// apply plugin: 'org.moallemi.advanced-build-version'
+apply plugin: 'org.moallemi.advanced-build-version'
 apply plugin: 'jacoco'
 
-/*
 advancedVersioning {
     nameOptions {
         versionPatch versionCode
@@ -16,22 +17,21 @@ advancedVersioning {
         nameFormat 'Transformer-${buildType}-${versionName}'
     }
 }
-*/
 
-// def appVersionName = advancedVersioning.versionName
-// def appVersionCode = advancedVersioning.versionCode
+def appVersionName = advancedVersioning.versionName
+def appVersionCode = advancedVersioning.versionCode
 def keyStore = file('transformer.keystore')
 
 android {
-    compileSdkVersion 25
+    compileSdkVersion 26
     buildToolsVersion gradle.buildToolsVersion
 
     defaultConfig {
         applicationId "me.drakeet.transformer"
         minSdkVersion 14
-        targetSdkVersion 25
-        versionCode 527
-        versionName 'x.xx'
+        targetSdkVersion 26
+        versionCode appVersionCode
+        versionName appVersionName
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
@@ -100,10 +100,10 @@ dependencies {
     implementation "com.google.android.agera:net:$gradle.ageraVersion"
     implementation "com.google.android.agera:content:$gradle.ageraVersion"
     implementation 'me.drakeet.agera:bus:1.0.0'
-    implementation 'com.google.code.gson:gson:2.8.1'
+    implementation 'com.google.code.gson:gson:2.8.2'
 
     debugImplementation "com.squareup.leakcanary:leakcanary-android:$gradle.leakCanaryVersion"
-    debugImplementation ("me.drakeet.library:crashwoodpecker:$gradle.crashwoodpeckerVersion", {
+    debugImplementation("me.drakeet.library:crashwoodpecker:$gradle.crashwoodpeckerVersion", {
         exclude group: 'com.android.support'
     })
 
@@ -113,10 +113,10 @@ dependencies {
     androidTestImplementation "com.android.support:appcompat-v7:$gradle.supportLibraryVersion"
     androidTestImplementation "com.android.support:design:$gradle.supportLibraryVersion"
 
-    implementation 'com.android.support.test.espresso:espresso-idling-resource:2.2.2'
+    implementation 'com.android.support.test.espresso:espresso-idling-resource:3.0.1'
 
-    androidTestImplementation 'com.android.support.test.espresso:espresso-contrib:2.2.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:2.2.2'
-    androidTestImplementation 'com.android.support.test:runner:0.5'
-    androidTestImplementation 'com.android.support.test:rules:0.5'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-contrib:3.0.1'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
+    androidTestImplementation 'com.android.support.test:runner:1.0.1'
+    androidTestImplementation 'com.android.support.test:rules:1.0.1'
 }
diff --git a/transformer/version.properties b/transformer/version.properties
@@ -1,2 +1,2 @@
-#Sat May 06 15:05:28 CST 2017
-AI_VERSION_CODE=527
+#Sat Oct 14 13:13:55 CST 2017
+AI_VERSION_CODE=528