diff --git a/dev/benchmarks/complex_layout/.metadata b/dev/benchmarks/complex_layout/.metadata
deleted file mode 100644
index 1b06421f772..00000000000
--- a/dev/benchmarks/complex_layout/.metadata
+++ /dev/null
@@ -1,10 +0,0 @@
-# This file tracks properties of this Flutter project.
-# Used by Flutter tool to assess capabilities and perform upgrades etc.
-#
-# This file should be version controlled and should not be manually edited.
-
-version:
- revision: ab51a0260d29d50800ae5c9665ecb01883a9b503
- channel: master
-
-project_type: app
diff --git a/dev/benchmarks/complex_layout/android/.gitignore b/dev/benchmarks/complex_layout/android/.gitignore
deleted file mode 100644
index 6f568019d3c..00000000000
--- a/dev/benchmarks/complex_layout/android/.gitignore
+++ /dev/null
@@ -1,13 +0,0 @@
-gradle-wrapper.jar
-/.gradle
-/captures/
-/gradlew
-/gradlew.bat
-/local.properties
-GeneratedPluginRegistrant.java
-
-# Remember to never publicly share your keystore.
-# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
-key.properties
-**/*.keystore
-**/*.jks
diff --git a/dev/benchmarks/complex_layout/android/app/build.gradle b/dev/benchmarks/complex_layout/android/app/build.gradle
index df54855277d..a923d9f5c69 100644
--- a/dev/benchmarks/complex_layout/android/app/build.gradle
+++ b/dev/benchmarks/complex_layout/android/app/build.gradle
@@ -5,8 +5,8 @@
def localProperties = new Properties()
def localPropertiesFile = rootProject.file('local.properties')
if (localPropertiesFile.exists()) {
- localPropertiesFile.withReader('UTF-8') { reader ->
- localProperties.load(reader)
+ localPropertiesFile.withInputStream { stream ->
+ localProperties.load(stream)
}
}
@@ -15,43 +15,22 @@ if (flutterRoot == null) {
throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
}
-def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
-if (flutterVersionCode == null) {
- flutterVersionCode = '1'
-}
-
-def flutterVersionName = localProperties.getProperty('flutter.versionName')
-if (flutterVersionName == null) {
- flutterVersionName = '1.0'
-}
-
apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
android {
compileSdkVersion flutter.compileSdkVersion
compileOptions {
- sourceCompatibility JavaVersion.VERSION_1_8
- targetCompatibility JavaVersion.VERSION_1_8
- }
-
- kotlinOptions {
- jvmTarget = '1.8'
- }
-
- sourceSets {
- main.java.srcDirs += 'src/main/kotlin'
+ sourceCompatibility JavaVersion.VERSION_11
+ targetCompatibility JavaVersion.VERSION_11
}
defaultConfig {
- // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
- applicationId "dev.flutter.complex_layout"
minSdkVersion flutter.minSdkVersion
targetSdkVersion flutter.targetSdkVersion
- versionCode flutterVersionCode.toInteger()
- versionName flutterVersionName
+ versionCode 1
+ versionName "0.0.1"
}
buildTypes {
@@ -66,7 +45,3 @@ android {
flutter {
source '../..'
}
-
-dependencies {
- implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-}
diff --git a/dev/benchmarks/complex_layout/android/app/src/debug/AndroidManifest.xml b/dev/benchmarks/complex_layout/android/app/src/debug/AndroidManifest.xml
deleted file mode 100644
index 9ec78ec34cc..00000000000
--- a/dev/benchmarks/complex_layout/android/app/src/debug/AndroidManifest.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
diff --git a/dev/benchmarks/complex_layout/android/app/src/main/AndroidManifest.xml b/dev/benchmarks/complex_layout/android/app/src/main/AndroidManifest.xml
index 86fbf36af06..8200a24452c 100644
--- a/dev/benchmarks/complex_layout/android/app/src/main/AndroidManifest.xml
+++ b/dev/benchmarks/complex_layout/android/app/src/main/AndroidManifest.xml
@@ -3,13 +3,16 @@ Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. -->
-
-
+
+
+
+
+
@@ -17,8 +20,5 @@ found in the LICENSE file. -->
-
diff --git a/dev/benchmarks/complex_layout/android/app/src/main/java/dev/flutter/complex_layout/MainActivity.java b/dev/benchmarks/complex_layout/android/app/src/main/java/dev/flutter/complex_layout/MainActivity.java
deleted file mode 100644
index a5604b1578b..00000000000
--- a/dev/benchmarks/complex_layout/android/app/src/main/java/dev/flutter/complex_layout/MainActivity.java
+++ /dev/null
@@ -1,10 +0,0 @@
-// 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.
-
-package dev.flutter.complex_layout;
-
-import io.flutter.embedding.android.FlutterActivity;
-
-public class MainActivity extends FlutterActivity {
-}
diff --git a/dev/benchmarks/complex_layout/android/app/src/main/res/drawable-v21/launch_background.xml b/dev/benchmarks/complex_layout/android/app/src/main/res/drawable-v21/launch_background.xml
deleted file mode 100644
index 9f19e2f9040..00000000000
--- a/dev/benchmarks/complex_layout/android/app/src/main/res/drawable-v21/launch_background.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
-