Since AS 3.0 is stable, migrate everything to gradle 3.0 ❤️

nearit · Oct 25, 2017 · 2c1c236 · 2c1c236
1 parent c432d97
commit 2c1c236
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
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.github.dcendents:android-maven-gradle-plugin:1.4.1"
         classpath 'com.google.gms:google-services:3.1.0'
 
@@ -19,7 +19,7 @@ allprojects {
     repositories {
         jcenter()
         maven { url "https://jitpack.io" }
-        maven { url "https://maven.google.com" }
+        google()
     }
 }
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
-#Fri Jan 13 15:19:35 CET 2017
+#Wed Oct 25 20:55:31 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
-org.gradle.jvmargs=-Xmx2048M
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+org.gradle.jvmargs=-Xmx2048M
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
diff --git a/nearit/build.gradle b/nearit/build.gradle
@@ -78,7 +78,7 @@ buildProperties {
 
 android {
     compileSdkVersion 26
-    buildToolsVersion '26.0.1'
+    buildToolsVersion '26.0.2'
 
     defaultConfig {
         minSdkVersion 15

diff --git a/sample-kotlin/build.gradle b/sample-kotlin/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.1.4-3'
+    ext.kotlin_version = '1.1.51'
     repositories {
         maven { url 'https://maven.fabric.io/public' }
         jcenter()

diff --git a/sample-kotlin/src/main/res/values/styles.xml b/sample-kotlin/src/main/res/values/styles.xml
@@ -26,7 +26,7 @@
         <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
     </style>
 
-    <style name="NearDialogTheme" parent="style/Theme.AppCompat.DayNight.Dialog">
+    <style name="NearDialogTheme" parent="Theme.AppCompat.DayNight.Dialog">
         <item name="windowNoTitle">true</item>
     </style>
 </resources>
diff --git a/sample/build.gradle b/sample/build.gradle
@@ -25,7 +25,7 @@ android {
         }
     }
     compileSdkVersion 26
-    buildToolsVersion '26.0.1'
+    buildToolsVersion '26.0.2'
     defaultConfig {
         applicationId "com.nearit.sample"
         minSdkVersion 15

diff --git a/sample/src/main/res/values/styles.xml b/sample/src/main/res/values/styles.xml
@@ -26,7 +26,7 @@
         <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
     </style>
 
-    <style name="NearDialogTheme" parent="style/Theme.AppCompat.DayNight.Dialog">
+    <style name="NearDialogTheme" parent="Theme.AppCompat.DayNight.Dialog">
         <item name="windowNoTitle">true</item>
     </style>
 </resources>