diff --git a/build.gradle b/build.gradle index 3daa34e..b7708b2 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.kotlin_version = '1.3.0' + ext.kotlin_version = '1.3.11' repositories { google() jcenter() diff --git a/gradle.properties b/gradle.properties index aac7c9b..9e6fce1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,6 +9,8 @@ # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. +android.enableJetifier=true +android.useAndroidX=true org.gradle.jvmargs=-Xmx1536m # When configured, Gradle will run in incubating parallel mode. diff --git a/money/build.gradle b/money/build.gradle index 9ea0c4b..d3d521d 100644 --- a/money/build.gradle +++ b/money/build.gradle @@ -13,7 +13,7 @@ android { versionCode 5 versionName "0.6.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/sample/build.gradle b/sample/build.gradle index 0e7a8ce..78bb10e 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -12,7 +12,7 @@ android { targetSdkVersion 28 versionCode 1 versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { release { @@ -28,7 +28,7 @@ dependencies { releaseImplementation 'com.github.tobiasschuerg:android-money:v0.5' implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation 'com.android.support:appcompat-v7:28.0.0' - implementation 'com.android.support.constraint:constraint-layout:1.1.3' + implementation 'androidx.appcompat:appcompat:1.1.0-alpha01' + implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha3' } diff --git a/sample/src/main/java/de/tobiasschuerg/money/sample/SampleActivity.kt b/sample/src/main/java/de/tobiasschuerg/money/sample/SampleActivity.kt index 3612260..cb199fe 100644 --- a/sample/src/main/java/de/tobiasschuerg/money/sample/SampleActivity.kt +++ b/sample/src/main/java/de/tobiasschuerg/money/sample/SampleActivity.kt @@ -2,7 +2,7 @@ package de.tobiasschuerg.money.sample import android.annotation.SuppressLint import android.os.Bundle -import android.support.v7.app.AppCompatActivity +import androidx.appcompat.app.AppCompatActivity import android.util.Log import de.tobiasschuerg.money.Currencies import de.tobiasschuerg.money.Currency diff --git a/sample/src/main/res/layout/activity_sample.xml b/sample/src/main/res/layout/activity_sample.xml index 0c70dcb..970ac87 100644 --- a/sample/src/main/res/layout/activity_sample.xml +++ b/sample/src/main/res/layout/activity_sample.xml @@ -1,5 +1,5 @@ - - +