diff --git a/example/blue/android/.gitignore b/example/blue/android/.gitignore index bc2100d..5da0a3e 100644 --- a/example/blue/android/.gitignore +++ b/example/blue/android/.gitignore @@ -1,7 +1,4 @@ -gradle-wrapper.jar /.gradle /captures/ -/gradlew -/gradlew.bat /local.properties GeneratedPluginRegistrant.java diff --git a/example/blue/android/app/build.gradle b/example/blue/android/app/build.gradle index 9be8e53..ebb19b2 100644 --- a/example/blue/android/app/build.gradle +++ b/example/blue/android/app/build.gradle @@ -26,7 +26,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' @@ -40,7 +40,7 @@ android { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "com.example.blue" minSdkVersion 21 - targetSdkVersion 28 + targetSdkVersion 31 versionCode flutterVersionCode.toInteger() versionName flutterVersionName testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -61,7 +61,7 @@ flutter { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test:runner:1.4.0' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' } diff --git a/example/blue/android/app/src/main/AndroidManifest.xml b/example/blue/android/app/src/main/AndroidManifest.xml index ebf0490..57e047c 100644 --- a/example/blue/android/app/src/main/AndroidManifest.xml +++ b/example/blue/android/app/src/main/AndroidManifest.xml @@ -15,7 +15,8 @@ android:theme="@style/LaunchTheme" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode" android:hardwareAccelerated="true" - android:windowSoftInputMode="adjustResize"> + android:windowSoftInputMode="adjustResize" + android:exported="true"> diff --git a/example/blue/android/app/src/main/kotlin/com/example/blue/MainActivity.kt b/example/blue/android/app/src/main/kotlin/com/example/blue/MainActivity.kt index a32b948..8a086fd 100644 --- a/example/blue/android/app/src/main/kotlin/com/example/blue/MainActivity.kt +++ b/example/blue/android/app/src/main/kotlin/com/example/blue/MainActivity.kt @@ -1,12 +1,12 @@ package com.example.blue -import androidx.annotation.NonNull; +import androidx.annotation.NonNull import io.flutter.embedding.android.FlutterActivity import io.flutter.embedding.engine.FlutterEngine import io.flutter.plugins.GeneratedPluginRegistrant class MainActivity: FlutterActivity() { override fun configureFlutterEngine(@NonNull flutterEngine: FlutterEngine) { - GeneratedPluginRegistrant.registerWith(flutterEngine); + GeneratedPluginRegistrant.registerWith(flutterEngine) } } diff --git a/example/blue/android/build.gradle b/example/blue/android/build.gradle index 3100ad2..319ffbb 100644 --- a/example/blue/android/build.gradle +++ b/example/blue/android/build.gradle @@ -1,12 +1,12 @@ buildscript { - ext.kotlin_version = '1.3.50' + ext.kotlin_version = '1.5.31' repositories { google() - jcenter() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:3.5.0' + classpath 'com.android.tools.build:gradle:7.0.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -14,7 +14,7 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() } } diff --git a/example/blue/android/gradle.properties b/example/blue/android/gradle.properties index 38c8d45..94adc3a 100644 --- a/example/blue/android/gradle.properties +++ b/example/blue/android/gradle.properties @@ -1,4 +1,3 @@ org.gradle.jvmargs=-Xmx1536M -android.enableR8=true android.useAndroidX=true android.enableJetifier=true diff --git a/example/blue/android/gradle/wrapper/gradle-wrapper.properties b/example/blue/android/gradle/wrapper/gradle-wrapper.properties index 296b146..0f80bbf 100644 --- a/example/blue/android/gradle/wrapper/gradle-wrapper.properties +++ b/example/blue/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Fri Jun 23 08:50:38 CEST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip