Unverified Commit 3b370c85 authored by Daco Harkes's avatar Daco Harkes Committed by GitHub

[deps] update Android SDK to 34 (#138183)

Update Android SDK from 33 to 34.

Following the engine update:

* https://github.com/flutter/engine/pull/47839
parent 1ff76863
This diff is collapsed.
...@@ -261,9 +261,8 @@ Future<void> main() async { ...@@ -261,9 +261,8 @@ Future<void> main() async {
'SampleApp', 'SampleApp',
'build', 'build',
'intermediates', 'intermediates',
'merged_assets', 'assets',
'debug', 'debug',
'out',
'flutter_assets', 'flutter_assets',
'assets', 'assets',
'read-only.txt', 'read-only.txt',
...@@ -333,9 +332,8 @@ Future<void> main() async { ...@@ -333,9 +332,8 @@ Future<void> main() async {
'SampleApp', 'SampleApp',
'build', 'build',
'intermediates', 'intermediates',
'merged_assets', 'assets',
'release', 'release',
'out',
'flutter_assets', 'flutter_assets',
'assets', 'assets',
'read-only.txt', 'read-only.txt',
......
...@@ -362,9 +362,8 @@ exitCode: $exitCode ...@@ -362,9 +362,8 @@ exitCode: $exitCode
'app', 'app',
'build', 'build',
'intermediates', 'intermediates',
'merged_assets', 'assets',
'debug', 'debug',
'out',
'flutter_assets', 'flutter_assets',
'assets', 'assets',
'read-only.txt', 'read-only.txt',
...@@ -452,9 +451,8 @@ exitCode: $exitCode ...@@ -452,9 +451,8 @@ exitCode: $exitCode
'app', 'app',
'build', 'build',
'intermediates', 'intermediates',
'merged_assets', 'assets',
'release', 'release',
'out',
'flutter_assets', 'flutter_assets',
'assets', 'assets',
'read-only.txt', 'read-only.txt',
......
...@@ -8,7 +8,7 @@ buildscript { ...@@ -8,7 +8,7 @@ buildscript {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:4.1.0' classpath 'com.android.tools.build:gradle:7.3.0'
} }
} }
......
...@@ -8,7 +8,7 @@ buildscript { ...@@ -8,7 +8,7 @@ buildscript {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:4.1.0' classpath 'com.android.tools.build:gradle:7.3.0'
} }
} }
......
...@@ -8,7 +8,7 @@ buildscript { ...@@ -8,7 +8,7 @@ buildscript {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:4.1.0' classpath 'com.android.tools.build:gradle:7.3.0'
} }
} }
......
...@@ -107,14 +107,14 @@ class BasicDeferredComponentsConfig extends DeferredComponentsConfig { ...@@ -107,14 +107,14 @@ class BasicDeferredComponentsConfig extends DeferredComponentsConfig {
@override @override
String get androidBuild => r''' String get androidBuild => r'''
buildscript { buildscript {
ext.kotlin_version = '1.3.50' ext.kotlin_version = '1.7.10'
repositories { repositories {
google() google()
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:4.1.0' classpath 'com.android.tools.build:gradle:7.3.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
} }
} }
...@@ -495,6 +495,7 @@ class BasicDeferredComponentsConfig extends DeferredComponentsConfig { ...@@ -495,6 +495,7 @@ class BasicDeferredComponentsConfig extends DeferredComponentsConfig {
android:extractNativeLibs="false"> android:extractNativeLibs="false">
<activity <activity
android:name=".MainActivity" android:name=".MainActivity"
android:exported="true"
android:launchMode="singleTop" android:launchMode="singleTop"
android:theme="@style/LaunchTheme" android:theme="@style/LaunchTheme"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
......
...@@ -83,14 +83,14 @@ class MultidexProject extends Project { ...@@ -83,14 +83,14 @@ class MultidexProject extends Project {
String get androidBuild => r''' String get androidBuild => r'''
buildscript { buildscript {
ext.kotlin_version = '1.3.50' ext.kotlin_version = '1.7.10'
repositories { repositories {
google() google()
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:4.1.0' classpath 'com.android.tools.build:gradle:7.3.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
} }
} }
...@@ -209,6 +209,7 @@ class MultidexProject extends Project { ...@@ -209,6 +209,7 @@ class MultidexProject extends Project {
android:name="${applicationName}"> android:name="${applicationName}">
<activity <activity
android:name=".MainActivity" android:name=".MainActivity"
android:exported="true"
android:launchMode="singleTop" android:launchMode="singleTop"
android:theme="@style/LaunchTheme" android:theme="@style/LaunchTheme"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment