diff --git a/build.gradle b/build.gradle index 3659416..d133052 100644 --- a/build.gradle +++ b/build.gradle @@ -2,17 +2,19 @@ buildscript { repositories { + google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' - classpath 'com.novoda:bintray-release:0.4.0' + classpath 'com.android.tools.build:gradle:3.6.2' + classpath 'com.novoda:bintray-release:0.5.0' } } allprojects { repositories { jcenter() + google() } } diff --git a/gradle.properties b/gradle.properties index ae91f6f..65ff7f4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,6 +10,8 @@ # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. # Default value: -Xmx10248m -XX:MaxPermSize=256m +android.enableJetifier=true +android.useAndroidX=true org.gradle.jvmargs=-Xmx1536m # When configured, Gradle will run in incubating parallel mode. diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index fb7acee..f6b961f 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 415e33f..1ad03af 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Feb 07 17:19:02 SGT 2017 +#Mon Mar 02 08:02:37 SGT 2020 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-5.6.4-all.zip diff --git a/ratethisapp/build.gradle b/ratethisapp/build.gradle index 929dc8d..afd9a70 100644 --- a/ratethisapp/build.gradle +++ b/ratethisapp/build.gradle @@ -2,12 +2,12 @@ apply plugin: "com.android.library" apply plugin: 'com.novoda.bintray-release' android { - compileSdkVersion 25 - buildToolsVersion "25.0.3" + compileSdkVersion 29 + buildToolsVersion "29.0.3" defaultConfig { - minSdkVersion 9 - targetSdkVersion 25 + minSdkVersion 14 + targetSdkVersion 29 versionCode 1 versionName "1.0" } @@ -20,9 +20,9 @@ android { } dependencies { - compile 'com.android.support:appcompat-v7:25.3.1' - testCompile 'junit:junit:4.12' - testCompile "org.robolectric:robolectric:3.3.2" + implementation 'androidx.appcompat:appcompat:1.1.0' + testImplementation 'junit:junit:4.12' + testImplementation "org.robolectric:robolectric:3.3.2" } publish { diff --git a/ratethisapp/src/main/java/com/kobakei/ratethisapp/RateThisApp.java b/ratethisapp/src/main/java/com/kobakei/ratethisapp/RateThisApp.java index bd00812..647f485 100644 --- a/ratethisapp/src/main/java/com/kobakei/ratethisapp/RateThisApp.java +++ b/ratethisapp/src/main/java/com/kobakei/ratethisapp/RateThisApp.java @@ -30,8 +30,8 @@ import android.content.pm.PackageManager; import android.net.Uri; import android.os.Build; -import android.support.annotation.StringRes; -import android.support.v7.app.AlertDialog; +import androidx.annotation.StringRes; +import androidx.appcompat.app.AlertDialog; import android.text.TextUtils; import android.util.Log; import android.view.KeyEvent; diff --git a/sample/build.gradle b/sample/build.gradle index 00e1ad7..e580c4c 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -1,12 +1,12 @@ apply plugin: "com.android.application" android { - compileSdkVersion 25 - buildToolsVersion "25.0.3" + compileSdkVersion 29 + buildToolsVersion "29.0.3" defaultConfig { - minSdkVersion 9 - targetSdkVersion 25 + minSdkVersion 14 + targetSdkVersion 29 versionCode 1 versionName "1.0.0" } @@ -19,7 +19,7 @@ android { } dependencies { - compile project(':ratethisapp') - compile 'com.android.support:support-v4:25.3.1' - compile 'com.android.support:appcompat-v7:25.3.1' + implementation project(':ratethisapp') + implementation 'androidx.legacy:legacy-support-v4:1.0.0' + implementation 'androidx.appcompat:appcompat:1.0.0' } diff --git a/sample/src/main/java/com/kobakei/ratethisapp/sample/MainActivity.java b/sample/src/main/java/com/kobakei/ratethisapp/sample/MainActivity.java index 41f92be..9e8516c 100644 --- a/sample/src/main/java/com/kobakei/ratethisapp/sample/MainActivity.java +++ b/sample/src/main/java/com/kobakei/ratethisapp/sample/MainActivity.java @@ -16,7 +16,7 @@ package com.kobakei.ratethisapp.sample; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.view.View; import android.widget.Button; import android.widget.Toast;