diff --git a/android/build.gradle b/android/build.gradle index faacca8a..254590ae 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -9,8 +9,8 @@ buildscript { } dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.70" - classpath 'com.android.tools.build:gradle:3.6.1' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.0" + classpath 'com.android.tools.build:gradle:3.6.4' } } @@ -28,14 +28,14 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' android { - compileSdkVersion 28 + compileSdkVersion 30 sourceSets { main.java.srcDirs += 'src/main/kotlin' } defaultConfig { minSdkVersion 16 - targetSdkVersion 28 + targetSdkVersion 30 versionCode 1 versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -68,7 +68,7 @@ android { } dependencies { - api 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.70' + api 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.71' implementation 'androidx.annotation:annotation:1.1.0' implementation 'com.stripe:stripe-android:16.10.0' implementation 'com.android.support:appcompat-v7:28.0.0' diff --git a/android/gradle.properties b/android/gradle.properties index 8bd86f68..53ae0ae4 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1 +1,3 @@ +android.enableJetifier=true +android.useAndroidX=true org.gradle.jvmargs=-Xmx1536M diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index b8417dba..02b50539 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip diff --git a/android/src/main/res/layout/activity_stripe.xml b/android/src/main/res/layout/activity_stripe.xml index 5385a75f..f27b836d 100644 --- a/android/src/main/res/layout/activity_stripe.xml +++ b/android/src/main/res/layout/activity_stripe.xml @@ -19,7 +19,7 @@