Unverified Commit 6e8ebb37 authored by Gary Qian's avatar Gary Qian Committed by GitHub

Reland "Upgrade targetSdkVersion and compileSdkVersion to 33" (#116146)

parent 8a806d67
......@@ -19,6 +19,7 @@ found in the LICENSE file. -->
<application android:name="${applicationName}" android:label="IntegrationUI">
<activity android:name=".MainActivity"
android:launchMode="singleTop"
android:exported="true"
android:theme="@android:style/Theme.Black.NoTitleBar"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density"
android:hardwareAccelerated="true"
......
......@@ -14,7 +14,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:4.1.3'
classpath 'com.android.tools.build:gradle:7.2.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
......
......@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
......@@ -30,13 +30,13 @@ import org.gradle.util.VersionNumber
/** For apps only. Provides the flutter extension used in app/build.gradle. */
class FlutterExtension {
/** Sets the compileSdkVersion used by default in Flutter app projects. */
static int compileSdkVersion = 31
static int compileSdkVersion = 33
/** Sets the minSdkVersion used by default in Flutter app projects. */
static int minSdkVersion = 16
/** Sets the targetSdkVersion used by default in Flutter app projects. */
static int targetSdkVersion = 31
static int targetSdkVersion = 33
/**
* Sets the ndkVersion used by default in Flutter app projects.
......
// Copyright 2014 The Flutter Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
import 'package:file/file.dart';
import 'package:flutter_tools/src/base/io.dart';
import '../src/common.dart';
import 'test_utils.dart';
void main() {
late Directory tempDir;
setUp(() async {
tempDir = createResolvedTempDirectorySync('run_test.');
});
tearDown(() async {
tryToDelete(tempDir);
});
testWithoutContext('build succeeds with api 33 features', () async {
final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter');
ProcessResult result = await processManager.run(<String>[
flutterBin,
'create',
tempDir.path,
'--project-name=testapp',
], workingDirectory: tempDir.path);
expect(result.exitCode, 0);
final File api33File = tempDir
.childDirectory('android')
.childDirectory('app')
.childDirectory('src')
.childDirectory('main')
.childDirectory('java')
.childFile('Android33Api.java');
api33File.createSync(recursive: true);
// AccessibilityManager.isAudioDescriptionRequested() is an API 33 feature
api33File.writeAsStringSync('''
import android.app.Activity;
import android.view.accessibility.AccessibilityManager;
import androidx.annotation.Keep;
import io.flutter.Log;
@Keep
public final class Android33Api extends Activity {
private AccessibilityManager accessibilityManager;
public Android33Api() {
accessibilityManager = getSystemService(AccessibilityManager.class);
}
public void doSomething() {
if (accessibilityManager.isAudioDescriptionRequested()) {
Log.e("flutter", "User has requested to enable audio descriptions");
}
}
}
''');
result = await processManager.run(<String>[
flutterBin,
...getLocalEngineArguments(),
'build',
'apk',
], workingDirectory: tempDir.path);
expect(result.exitCode, 0);
expect(result.stdout.toString(), contains('app-release.apk'));
});
}
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