Update to Android Studio 3.0, with new gradle and build tools

ABCRic · Nov 2, 2017 · d3d1f94 · d3d1f94
1 parent 57b9e96
commit d3d1f94
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 25 deletions.
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -14,7 +14,7 @@ repositories {
 
 android {
     compileSdkVersion 25
-    buildToolsVersion "25.0.1"
+    buildToolsVersion '26.0.2'
     defaultConfig {
         applicationId "im.tny.segvault.disturbances"
         minSdkVersion 15
@@ -43,8 +43,7 @@ dependencies {
     androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    debugCompile project(path: ':s2ls', configuration: "debug")
-    releaseCompile project(path: ':s2ls', configuration: "release")
+    implementation project(':s2ls')
     compile 'com.fasterxml.jackson.core:jackson-databind:2.8.8.1'
     compile 'org.msgpack:jackson-dataformat-msgpack:0.8.13'
     compile 'com.evernote:android-job:1.1.9'

diff --git a/app/src/main/res/drawable/ic_done_success.xml b/app/src/main/res/drawable/ic_done_success.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/colorSuccess"
+        android:fillColor="#4CAF50"
         android:pathData="M9,16.2L4.8,12l-1.4,1.4L9,19 21,7l-1.4,-1.4L9,16.2z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_edit_primary_light_24dp.xml b/app/src/main/res/drawable/ic_edit_primary_light_24dp.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/colorPrimaryLight"
+        android:fillColor="#5591CD"
         android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_stop_accent_24dp.xml b/app/src/main/res/drawable/ic_stop_accent_24dp.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/colorAccent"
+        android:fillColor="#F15D2A"
         android:pathData="M6,6h12v12H6z"/>
 </vector>
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:3.0.0'
         classpath 'com.google.gms:google-services:3.0.0'
         classpath 'io.realm:realm-gradle-plugin:3.5.0'
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Apr 05 15:51:08 WEST 2017
+#Thu Nov 02 16:19:22 WET 2017
 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
diff --git a/s2ls/build.gradle b/s2ls/build.gradle
@@ -6,7 +6,7 @@ repositories {
 
 android {
     compileSdkVersion 25
-    buildToolsVersion "25.0.1"
+    buildToolsVersion '26.0.2'
 
     defaultConfig {
         minSdkVersion 15