diff --git a/add_to_app/android_view/android_view/app/build.gradle b/add_to_app/android_view/android_view/app/build.gradle
index 7977fae89..bedc93efd 100644
--- a/add_to_app/android_view/android_view/app/build.gradle
+++ b/add_to_app/android_view/android_view/app/build.gradle
@@ -4,7 +4,7 @@ plugins {
}
android {
- compileSdk 34
+ compileSdk 35
lint {
baseline = file("lint-baseline.xml")
@@ -13,7 +13,7 @@ android {
defaultConfig {
applicationId "dev.flutter.example.androidView"
minSdkVersion 21
- targetSdkVersion 34
+ targetSdk 35
versionCode 1
versionName "1.0"
@@ -41,18 +41,18 @@ android {
dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
- implementation 'androidx.core:core-ktx:1.10.0'
- implementation 'androidx.appcompat:appcompat:1.2.0'
- implementation 'com.google.android.material:material:1.2.1'
- implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
- implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
- implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.2.0'
- implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0'
- implementation 'androidx.navigation:navigation-fragment-ktx:2.3.2'
- implementation 'androidx.navigation:navigation-ui-ktx:2.3.2'
- implementation "androidx.recyclerview:recyclerview:1.1.0"
+ implementation 'androidx.core:core-ktx:1.13.1'
+ implementation 'androidx.appcompat:appcompat:1.7.0'
+ implementation 'com.google.android.material:material:1.12.0'
+ implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+ implementation 'androidx.vectordrawable:vectordrawable:1.2.0'
+ implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.8.4'
+ implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.4'
+ implementation 'androidx.navigation:navigation-fragment-ktx:2.7.7'
+ implementation 'androidx.navigation:navigation-ui-ktx:2.7.7'
+ implementation "androidx.recyclerview:recyclerview:1.3.2"
implementation project(path: ':flutter')
testImplementation 'junit:junit:4.+'
- androidTestImplementation 'androidx.test.ext:junit:1.1.2'
- androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+ androidTestImplementation 'androidx.test.ext:junit:1.2.1'
+ androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
}
\ No newline at end of file
diff --git a/add_to_app/android_view/android_view/build.gradle b/add_to_app/android_view/android_view/build.gradle
index f6f55b661..185bd70ba 100644
--- a/add_to_app/android_view/android_view/build.gradle
+++ b/add_to_app/android_view/android_view/build.gradle
@@ -1,12 +1,12 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
- ext.kotlin_version = '1.8.0'
+ ext.kotlin_version = '1.8.22'
repositories {
google()
mavenCentral()
}
dependencies {
- classpath 'com.android.tools.build:gradle:8.3.2'
+ classpath 'com.android.tools.build:gradle:8.5.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// NOTE: Do not place your application dependencies here; they belong
@@ -21,6 +21,6 @@ allprojects {
}
}
-task clean(type: Delete) {
+tasks.register('clean', Delete) {
delete rootProject.buildDir
}
\ No newline at end of file
diff --git a/add_to_app/android_view/android_view/gradle/wrapper/gradle-wrapper.properties b/add_to_app/android_view/android_view/gradle/wrapper/gradle-wrapper.properties
index 17655d0ef..b167d362a 100644
--- a/add_to_app/android_view/android_view/gradle/wrapper/gradle-wrapper.properties
+++ b/add_to_app/android_view/android_view/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Fri Jul 26 11:31:21 EDT 2024
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/add_to_app/multiple_flutters/multiple_flutters_android/app/build.gradle b/add_to_app/multiple_flutters/multiple_flutters_android/app/build.gradle
index 9448d2fd4..72233ab7f 100644
--- a/add_to_app/multiple_flutters/multiple_flutters_android/app/build.gradle
+++ b/add_to_app/multiple_flutters/multiple_flutters_android/app/build.gradle
@@ -8,12 +8,12 @@ android {
self {
}
}
- compileSdkVersion 33
+ compileSdk 35
defaultConfig {
applicationId "dev.flutter.multipleflutters"
minSdkVersion 24
- targetSdkVersion 33
+ targetSdk 35
versionCode 1
versionName "1.0"
@@ -40,12 +40,12 @@ android {
dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
- implementation 'androidx.core:core-ktx:1.2.0'
- implementation 'androidx.appcompat:appcompat:1.1.0'
- implementation 'com.google.android.material:material:1.1.0'
- implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+ implementation 'androidx.core:core-ktx:1.13.1'
+ implementation 'androidx.appcompat:appcompat:1.7.0'
+ implementation 'com.google.android.material:material:1.12.0'
+ implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
testImplementation 'junit:junit:4.+'
- androidTestImplementation 'androidx.test.ext:junit:1.1.1'
- androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+ androidTestImplementation 'androidx.test.ext:junit:1.2.1'
+ androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
implementation project(':flutter')
}
\ No newline at end of file
diff --git a/add_to_app/multiple_flutters/multiple_flutters_android/app/src/main/res/layout/activity_main.xml b/add_to_app/multiple_flutters/multiple_flutters_android/app/src/main/res/layout/activity_main.xml
index e5ef998fa..33bc09512 100644
--- a/add_to_app/multiple_flutters/multiple_flutters_android/app/src/main/res/layout/activity_main.xml
+++ b/add_to_app/multiple_flutters/multiple_flutters_android/app/src/main/res/layout/activity_main.xml
@@ -11,7 +11,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="1dp"
- android:layout_marginRight="260dp"
+ android:layout_marginEnd="260dp"
android:text="Hello World!"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent"
diff --git a/add_to_app/multiple_flutters/multiple_flutters_android/app/src/main/res/values-night/themes.xml b/add_to_app/multiple_flutters/multiple_flutters_android/app/src/main/res/values-night/themes.xml
index c7a6e63c5..964799397 100644
--- a/add_to_app/multiple_flutters/multiple_flutters_android/app/src/main/res/values-night/themes.xml
+++ b/add_to_app/multiple_flutters/multiple_flutters_android/app/src/main/res/values-night/themes.xml
@@ -10,7 +10,7 @@
- @color/teal_200
- @color/black
- - ?attr/colorPrimaryVariant
+ - ?attr/colorPrimaryVariant
\ No newline at end of file
diff --git a/add_to_app/multiple_flutters/multiple_flutters_android/app/src/main/res/values/themes.xml b/add_to_app/multiple_flutters/multiple_flutters_android/app/src/main/res/values/themes.xml
index 9623b5d83..c657f764d 100644
--- a/add_to_app/multiple_flutters/multiple_flutters_android/app/src/main/res/values/themes.xml
+++ b/add_to_app/multiple_flutters/multiple_flutters_android/app/src/main/res/values/themes.xml
@@ -10,7 +10,7 @@
- @color/teal_700
- @color/black
- - ?attr/colorPrimaryVariant
+ - ?attr/colorPrimaryVariant
\ No newline at end of file
diff --git a/add_to_app/multiple_flutters/multiple_flutters_android/build.gradle b/add_to_app/multiple_flutters/multiple_flutters_android/build.gradle
index 28c806928..a39608737 100644
--- a/add_to_app/multiple_flutters/multiple_flutters_android/build.gradle
+++ b/add_to_app/multiple_flutters/multiple_flutters_android/build.gradle
@@ -6,7 +6,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
@@ -21,6 +21,6 @@ allprojects {
}
}
-task clean(type: Delete) {
+tasks.register('clean', Delete) {
delete rootProject.buildDir
}
\ No newline at end of file
diff --git a/add_to_app/multiple_flutters/multiple_flutters_android/gradle.properties b/add_to_app/multiple_flutters/multiple_flutters_android/gradle.properties
index 98bed167d..8145fa7be 100644
--- a/add_to_app/multiple_flutters/multiple_flutters_android/gradle.properties
+++ b/add_to_app/multiple_flutters/multiple_flutters_android/gradle.properties
@@ -18,4 +18,7 @@ android.useAndroidX=true
# Automatically convert third-party libraries to use AndroidX
android.enableJetifier=true
# Kotlin code style for this project: "official" or "obsolete":
-kotlin.code.style=official
\ No newline at end of file
+kotlin.code.style=official
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
\ No newline at end of file
diff --git a/add_to_app/multiple_flutters/multiple_flutters_android/gradle/wrapper/gradle-wrapper.properties b/add_to_app/multiple_flutters/multiple_flutters_android/gradle/wrapper/gradle-wrapper.properties
index 5ea51d943..7433d5706 100644
--- a/add_to_app/multiple_flutters/multiple_flutters_android/gradle/wrapper/gradle-wrapper.properties
+++ b/add_to_app/multiple_flutters/multiple_flutters_android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
#Mon Dec 11 09:57:20 AEDT 2023
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