diff --git a/add_to_app/prebuilt_module/android_using_prebuilt_module/app/build.gradle b/add_to_app/prebuilt_module/android_using_prebuilt_module/app/build.gradle index 4a0aa486c92..95bbdffb75b 100644 --- a/add_to_app/prebuilt_module/android_using_prebuilt_module/app/build.gradle +++ b/add_to_app/prebuilt_module/android_using_prebuilt_module/app/build.gradle @@ -3,11 +3,11 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' android { - compileSdkVersion 33 + compileSdk 34 defaultConfig { applicationId "dev.flutter.example.androidusingprebuiltmodule" minSdkVersion 21 - targetSdkVersion 33 + targetSdkVersion 34 versionCode 1 versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -22,6 +22,9 @@ android { sourceCompatibility 1.8 targetCompatibility 1.8 } + kotlinOptions { + jvmTarget = '1.8' + } namespace 'dev.flutter.example.androidusingprebuiltmodule' } @@ -48,12 +51,12 @@ dependencies { implementation 'androidx.multidex:multidex:2.0.1' implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation 'androidx.appcompat:appcompat:1.6.1' - implementation 'androidx.core:core-ktx:1.10.1' + implementation 'androidx.appcompat:appcompat:1.7.0' + implementation 'androidx.core:core-ktx:1.13.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' - testImplementation 'junit:junit:4.12' + testImplementation 'junit:junit:4.13.2' androidTestImplementation "com.google.truth:truth:1.1.3" - androidTestImplementation 'androidx.test:runner:1.5.2' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' - api 'androidx.test:core:1.5.0' + androidTestImplementation 'androidx.test:runner:1.1.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' + api 'androidx.test:core:1.2.1' } diff --git a/add_to_app/prebuilt_module/android_using_prebuilt_module/app/src/main/java/dev/flutter/example/androidusingprebuiltmodule/MainActivity.kt b/add_to_app/prebuilt_module/android_using_prebuilt_module/app/src/main/java/dev/flutter/example/androidusingprebuiltmodule/MainActivity.kt index 30d56992e3f..867aee59289 100644 --- a/add_to_app/prebuilt_module/android_using_prebuilt_module/app/src/main/java/dev/flutter/example/androidusingprebuiltmodule/MainActivity.kt +++ b/add_to_app/prebuilt_module/android_using_prebuilt_module/app/src/main/java/dev/flutter/example/androidusingprebuiltmodule/MainActivity.kt @@ -4,6 +4,7 @@ package dev.flutter.example.androidusingprebuiltmodule +import android.annotation.SuppressLint import android.os.Bundle import android.widget.Button import android.widget.TextView @@ -29,6 +30,7 @@ class MainActivity : AppCompatActivity() { } } + @SuppressLint("SetTextI18n") override fun onResume() { super.onResume() val app = application as MyApplication diff --git a/add_to_app/prebuilt_module/android_using_prebuilt_module/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/add_to_app/prebuilt_module/android_using_prebuilt_module/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index eca70cfe52e..6f3b755bf50 100644 --- a/add_to_app/prebuilt_module/android_using_prebuilt_module/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/add_to_app/prebuilt_module/android_using_prebuilt_module/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -2,4 +2,5 @@ + \ No newline at end of file diff --git a/add_to_app/prebuilt_module/android_using_prebuilt_module/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/add_to_app/prebuilt_module/android_using_prebuilt_module/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index eca70cfe52e..6f3b755bf50 100644 --- a/add_to_app/prebuilt_module/android_using_prebuilt_module/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/add_to_app/prebuilt_module/android_using_prebuilt_module/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -2,4 +2,5 @@ + \ No newline at end of file diff --git a/add_to_app/prebuilt_module/android_using_prebuilt_module/build.gradle b/add_to_app/prebuilt_module/android_using_prebuilt_module/build.gradle index 6dfe3ca9ff5..2097733f9ea 100644 --- a/add_to_app/prebuilt_module/android_using_prebuilt_module/build.gradle +++ b/add_to_app/prebuilt_module/android_using_prebuilt_module/build.gradle @@ -7,7 +7,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.android.tools.build:gradle:8.3.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/add_to_app/prebuilt_module/android_using_prebuilt_module/gradle.properties b/add_to_app/prebuilt_module/android_using_prebuilt_module/gradle.properties index 9e73ebcb6fb..47954809052 100644 --- a/add_to_app/prebuilt_module/android_using_prebuilt_module/gradle.properties +++ b/add_to_app/prebuilt_module/android_using_prebuilt_module/gradle.properties @@ -19,6 +19,5 @@ android.useAndroidX=true android.enableJetifier=true # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official -android.defaults.buildfeatures.buildconfig=true android.nonTransitiveRClass=false android.nonFinalResIds=false diff --git a/add_to_app/prebuilt_module/android_using_prebuilt_module/gradle/wrapper/gradle-wrapper.properties b/add_to_app/prebuilt_module/android_using_prebuilt_module/gradle/wrapper/gradle-wrapper.properties index 774fae87671..17655d0ef2b 100644 --- a/add_to_app/prebuilt_module/android_using_prebuilt_module/gradle/wrapper/gradle-wrapper.properties +++ b/add_to_app/prebuilt_module/android_using_prebuilt_module/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists