diff --git a/android/build.gradle b/android/build.gradle index faacca8a..77df7aff 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.5.31" + classpath 'com.android.tools.build:gradle:4.1.3' } } @@ -28,14 +28,14 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' android { - compileSdkVersion 28 + compileSdkVersion 31 sourceSets { main.java.srcDirs += 'src/main/kotlin' } defaultConfig { minSdkVersion 16 - targetSdkVersion 28 + targetSdkVersion 31 versionCode 1 versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -70,7 +70,7 @@ android { dependencies { api 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.70' implementation 'androidx.annotation:annotation:1.1.0' - implementation 'com.stripe:stripe-android:16.10.0' + implementation 'com.stripe:stripe-android:16.10.2' implementation 'com.android.support:appcompat-v7:28.0.0' implementation 'com.google.android.gms:play-services-wallet:18.0.0' } diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index b8417dba..029a7963 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-6.7-all.zip diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 56787aba..32b413df 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -16,7 +16,7 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 28 + compileSdkVersion 31 sourceSets { main.java.srcDirs += 'src/main/kotlin' @@ -30,7 +30,7 @@ android { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "de.jonasbark.stripepaymentexample" minSdkVersion 21 - targetSdkVersion 29 + targetSdkVersion 31 versionCode 1 multiDexEnabled true versionName "1.0" diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml index df520cc4..ec1d669a 100644 --- a/example/android/app/src/main/AndroidManifest.xml +++ b/example/android/app/src/main/AndroidManifest.xml @@ -13,7 +13,7 @@ additional functionality it is fine to subclass or reimplement FlutterApplication and put your custom class here. --> + android:name="flutterEmbedding" + android:value="2" /> + diff --git a/example/android/app/src/main/kotlin/jonasbark/de/stripepaymentexample/MainActivity.kt b/example/android/app/src/main/kotlin/jonasbark/de/stripepaymentexample/MainActivity.kt index 2899e47a..15e16f10 100644 --- a/example/android/app/src/main/kotlin/jonasbark/de/stripepaymentexample/MainActivity.kt +++ b/example/android/app/src/main/kotlin/jonasbark/de/stripepaymentexample/MainActivity.kt @@ -1,16 +1,10 @@ package jonasbark.de.stripepaymentexample import android.os.Bundle -import io.flutter.app.FlutterActivity +import io.flutter.embedding.android.FlutterActivity; import io.flutter.plugins.GeneratedPluginRegistrant class MainActivity : FlutterActivity() { - - @Override - protected override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - GeneratedPluginRegistrant.registerWith(this) - } } diff --git a/example/android/app/src/main/res/values/styles.xml b/example/android/app/src/main/res/values/styles.xml index 8676405e..38dc73f9 100644 --- a/example/android/app/src/main/res/values/styles.xml +++ b/example/android/app/src/main/res/values/styles.xml @@ -5,4 +5,5 @@ Flutter draws its first frame --> @drawable/launch_background + diff --git a/example/android/build.gradle b/example/android/build.gradle index 09661dbb..4f95267a 100644 --- a/example/android/build.gradle +++ b/example/android/build.gradle @@ -1,12 +1,26 @@ buildscript { - ext.kotlin_version = '1.3.70' + ext.kotlin_version = '1.5.31' repositories { google() + mavenCentral() jcenter() + maven { url 'https://maven.aliyun.com/repository/public' } + maven { url 'https://maven.aliyun.com/repository/google' } + maven { url 'https://maven.aliyun.com/repository/gradle-plugin' } + maven{ + url 'https://artifact.bytedance.com/repository/Volcengine/' + } + mavenCentral() + maven { + url 'https://jitpack.io' + } + maven { + url 'https://maven.aliyun.com/nexus/content/groups/public/' + } } dependencies { - classpath 'com.android.tools.build:gradle:3.6.1' + classpath 'com.android.tools.build:gradle:4.1.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -14,7 +28,21 @@ buildscript { allprojects { repositories { google() + mavenCentral() jcenter() + maven { url 'https://maven.aliyun.com/repository/public' } + maven { url 'https://maven.aliyun.com/repository/google' } + maven { url 'https://maven.aliyun.com/repository/gradle-plugin' } + maven{ + url 'https://artifact.bytedance.com/repository/Volcengine/' + } + mavenCentral() + maven { + url 'https://jitpack.io' + } + maven { + url 'https://maven.aliyun.com/nexus/content/groups/public/' + } } } diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties index e5535918..25be5ab2 100644 --- a/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/example/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.6.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip