Skip to content

Commit f443fa6

Browse files
authored
Update add to app android_view to api 35 (#2368)
Part 1/n flutter/flutter#152374 ## Pre-launch Checklist - [x] I read the [Flutter Style Guide] _recently_, and have followed its advice. - [x] I signed the [CLA]. - [x] I read the [Contributors Guide]. - [x] I updated/added relevant documentation (doc comments with `///`). - [ ] All existing and new tests are passing.
1 parent c75d9fa commit f443fa6

File tree

10 files changed

+37
-33
lines changed

10 files changed

+37
-33
lines changed

add_to_app/android_view/android_view/app/build.gradle

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
}
55

66
android {
7-
compileSdk 34
7+
compileSdk 35
88

99
lint {
1010
baseline = file("lint-baseline.xml")
@@ -13,7 +13,7 @@ android {
1313
defaultConfig {
1414
applicationId "dev.flutter.example.androidView"
1515
minSdkVersion 21
16-
targetSdkVersion 34
16+
targetSdk 35
1717
versionCode 1
1818
versionName "1.0"
1919

@@ -41,18 +41,18 @@ android {
4141

4242
dependencies {
4343
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
44-
implementation 'androidx.core:core-ktx:1.10.0'
45-
implementation 'androidx.appcompat:appcompat:1.2.0'
46-
implementation 'com.google.android.material:material:1.2.1'
47-
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
48-
implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
49-
implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.2.0'
50-
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0'
51-
implementation 'androidx.navigation:navigation-fragment-ktx:2.3.2'
52-
implementation 'androidx.navigation:navigation-ui-ktx:2.3.2'
53-
implementation "androidx.recyclerview:recyclerview:1.1.0"
44+
implementation 'androidx.core:core-ktx:1.13.1'
45+
implementation 'androidx.appcompat:appcompat:1.7.0'
46+
implementation 'com.google.android.material:material:1.12.0'
47+
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
48+
implementation 'androidx.vectordrawable:vectordrawable:1.2.0'
49+
implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.8.4'
50+
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.4'
51+
implementation 'androidx.navigation:navigation-fragment-ktx:2.7.7'
52+
implementation 'androidx.navigation:navigation-ui-ktx:2.7.7'
53+
implementation "androidx.recyclerview:recyclerview:1.3.2"
5454
implementation project(path: ':flutter')
5555
testImplementation 'junit:junit:4.+'
56-
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
57-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
56+
androidTestImplementation 'androidx.test.ext:junit:1.2.1'
57+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
5858
}

add_to_app/android_view/android_view/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22
buildscript {
3-
ext.kotlin_version = '1.8.0'
3+
ext.kotlin_version = '1.8.22'
44
repositories {
55
google()
66
mavenCentral()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:8.3.2'
9+
classpath 'com.android.tools.build:gradle:8.5.1'
1010
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1111

1212
// NOTE: Do not place your application dependencies here; they belong
@@ -21,6 +21,6 @@ allprojects {
2121
}
2222
}
2323

24-
task clean(type: Delete) {
24+
tasks.register('clean', Delete) {
2525
delete rootProject.buildDir
2626
}
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
#Fri Jul 26 11:31:21 EDT 2024
12
distributionBase=GRADLE_USER_HOME
23
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
45
zipStoreBase=GRADLE_USER_HOME
56
zipStorePath=wrapper/dists

add_to_app/multiple_flutters/multiple_flutters_android/app/build.gradle

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ android {
88
self {
99
}
1010
}
11-
compileSdkVersion 33
11+
compileSdk 35
1212

1313
defaultConfig {
1414
applicationId "dev.flutter.multipleflutters"
1515
minSdkVersion 24
16-
targetSdkVersion 33
16+
targetSdk 35
1717
versionCode 1
1818
versionName "1.0"
1919

@@ -40,12 +40,12 @@ android {
4040
dependencies {
4141

4242
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
43-
implementation 'androidx.core:core-ktx:1.2.0'
44-
implementation 'androidx.appcompat:appcompat:1.1.0'
45-
implementation 'com.google.android.material:material:1.1.0'
46-
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
43+
implementation 'androidx.core:core-ktx:1.13.1'
44+
implementation 'androidx.appcompat:appcompat:1.7.0'
45+
implementation 'com.google.android.material:material:1.12.0'
46+
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
4747
testImplementation 'junit:junit:4.+'
48-
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
49-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
48+
androidTestImplementation 'androidx.test.ext:junit:1.2.1'
49+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
5050
implementation project(':flutter')
5151
}

add_to_app/multiple_flutters/multiple_flutters_android/app/src/main/res/layout/activity_main.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
android:layout_width="wrap_content"
1212
android:layout_height="wrap_content"
1313
android:layout_marginStart="1dp"
14-
android:layout_marginRight="260dp"
14+
android:layout_marginEnd="260dp"
1515
android:text="Hello World!"
1616
app:layout_constraintBottom_toBottomOf="parent"
1717
app:layout_constraintRight_toRightOf="parent"

add_to_app/multiple_flutters/multiple_flutters_android/app/src/main/res/values-night/themes.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<item name="colorSecondaryVariant">@color/teal_200</item>
1111
<item name="colorOnSecondary">@color/black</item>
1212
<!-- Status bar color. -->
13-
<item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
13+
<item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
1414
<!-- Customize your theme here. -->
1515
</style>
1616
</resources>

add_to_app/multiple_flutters/multiple_flutters_android/app/src/main/res/values/themes.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<item name="colorSecondaryVariant">@color/teal_700</item>
1111
<item name="colorOnSecondary">@color/black</item>
1212
<!-- Status bar color. -->
13-
<item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
13+
<item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
1414
<!-- Customize your theme here. -->
1515
</style>
1616
</resources>

add_to_app/multiple_flutters/multiple_flutters_android/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
mavenCentral()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:7.4.2'
9+
classpath 'com.android.tools.build:gradle:8.3.2'
1010
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1111

1212
// NOTE: Do not place your application dependencies here; they belong
@@ -21,6 +21,6 @@ allprojects {
2121
}
2222
}
2323

24-
task clean(type: Delete) {
24+
tasks.register('clean', Delete) {
2525
delete rootProject.buildDir
2626
}

add_to_app/multiple_flutters/multiple_flutters_android/gradle.properties

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,7 @@ android.useAndroidX=true
1818
# Automatically convert third-party libraries to use AndroidX
1919
android.enableJetifier=true
2020
# Kotlin code style for this project: "official" or "obsolete":
21-
kotlin.code.style=official
21+
kotlin.code.style=official
22+
android.defaults.buildfeatures.buildconfig=true
23+
android.nonTransitiveRClass=false
24+
android.nonFinalResIds=false
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Mon Dec 11 09:57:20 AEDT 2023
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)