Revert "Update /examples/ to new gradle based build flow (#8173)" (#8177)
This reverts commit 8da4778e1d36111e39829d88edbe91dc041368f4.
diff --git a/examples/flutter_gallery/android/.gitignore b/examples/flutter_gallery/android/.gitignore
deleted file mode 100644
index 5c4ef82..0000000
--- a/examples/flutter_gallery/android/.gitignore
+++ /dev/null
@@ -1,12 +0,0 @@
-*.iml
-.gradle
-/local.properties
-/.idea/workspace.xml
-/.idea/libraries
-.DS_Store
-/build
-/captures
-
-/gradle
-/gradlew
-/gradlew.bat
diff --git a/examples/flutter_gallery/android/app/src/main/AndroidManifest.xml b/examples/flutter_gallery/android/AndroidManifest.xml
similarity index 100%
rename from examples/flutter_gallery/android/app/src/main/AndroidManifest.xml
rename to examples/flutter_gallery/android/AndroidManifest.xml
diff --git a/examples/flutter_gallery/android/app/build.gradle b/examples/flutter_gallery/android/app/build.gradle
deleted file mode 100644
index 90c2899..0000000
--- a/examples/flutter_gallery/android/app/build.gradle
+++ /dev/null
@@ -1,46 +0,0 @@
-def localProperties = new Properties()
-def localPropertiesFile = rootProject.file('local.properties')
-if (localPropertiesFile.exists()) {
- localPropertiesFile.withInputStream { stream ->
- localProperties.load(stream)
- }
-}
-
-def flutterRoot = localProperties.getProperty('flutter.sdk')
-if (flutterRoot == null) {
- throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
-}
-
-apply plugin: 'com.android.application'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
-
-android {
- compileSdkVersion 25
- buildToolsVersion '24.0.1'
-
- lintOptions {
- disable 'InvalidPackage'
- }
-
- defaultConfig {
- testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
- }
-
- buildTypes {
- release {
- // TODO: Add your own signing config for the release build.
- // Signing with the debug keys for now, so `flutter run --release` works.
- signingConfig signingConfigs.debug
- }
- }
-}
-
-flutter {
- source '../..'
-}
-
-dependencies {
- androidTestCompile 'com.android.support:support-annotations:25.0.0'
- androidTestCompile 'com.android.support.test:runner:0.5'
- androidTestCompile 'com.android.support.test:rules:0.5'
-}
diff --git a/examples/flutter_gallery/android/build.gradle b/examples/flutter_gallery/android/build.gradle
deleted file mode 100644
index d82a154..0000000
--- a/examples/flutter_gallery/android/build.gradle
+++ /dev/null
@@ -1,23 +0,0 @@
-buildscript {
- repositories {
- jcenter()
- }
-
- dependencies {
- classpath 'com.android.tools.build:gradle:2.2.3'
- }
-}
-
-allprojects {
- repositories {
- jcenter()
- }
-}
-
-task clean(type: Delete) {
- delete rootProject.buildDir
-}
-
-task wrapper(type: Wrapper) {
- gradleVersion = '2.14.1'
-}
diff --git a/examples/flutter_gallery/android/gradle.properties b/examples/flutter_gallery/android/gradle.properties
deleted file mode 100644
index 8bd86f6..0000000
--- a/examples/flutter_gallery/android/gradle.properties
+++ /dev/null
@@ -1 +0,0 @@
-org.gradle.jvmargs=-Xmx1536M
diff --git a/examples/flutter_gallery/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/examples/flutter_gallery/android/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from examples/flutter_gallery/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
rename to examples/flutter_gallery/android/res/mipmap-hdpi/ic_launcher.png
Binary files differ
diff --git a/examples/flutter_gallery/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/examples/flutter_gallery/android/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from examples/flutter_gallery/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
rename to examples/flutter_gallery/android/res/mipmap-mdpi/ic_launcher.png
Binary files differ
diff --git a/examples/flutter_gallery/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/examples/flutter_gallery/android/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from examples/flutter_gallery/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
rename to examples/flutter_gallery/android/res/mipmap-xhdpi/ic_launcher.png
Binary files differ
diff --git a/examples/flutter_gallery/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/examples/flutter_gallery/android/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from examples/flutter_gallery/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
rename to examples/flutter_gallery/android/res/mipmap-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/examples/flutter_gallery/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/examples/flutter_gallery/android/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from examples/flutter_gallery/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
rename to examples/flutter_gallery/android/res/mipmap-xxxhdpi/ic_launcher.png
Binary files differ
diff --git a/examples/flutter_gallery/android/settings.gradle b/examples/flutter_gallery/android/settings.gradle
deleted file mode 100644
index e7b4def..0000000
--- a/examples/flutter_gallery/android/settings.gradle
+++ /dev/null
@@ -1 +0,0 @@
-include ':app'
diff --git a/examples/hello_services/android/app/build.gradle b/examples/hello_services/android/app/build.gradle
index 90c2899..a8a6695 100644
--- a/examples/hello_services/android/app/build.gradle
+++ b/examples/hello_services/android/app/build.gradle
@@ -16,7 +16,7 @@
android {
compileSdkVersion 25
- buildToolsVersion '24.0.1'
+ buildToolsVersion '24.0.2'
lintOptions {
disable 'InvalidPackage'
diff --git a/examples/hello_world/android/.gitignore b/examples/hello_world/android/.gitignore
deleted file mode 100644
index 5c4ef82..0000000
--- a/examples/hello_world/android/.gitignore
+++ /dev/null
@@ -1,12 +0,0 @@
-*.iml
-.gradle
-/local.properties
-/.idea/workspace.xml
-/.idea/libraries
-.DS_Store
-/build
-/captures
-
-/gradle
-/gradlew
-/gradlew.bat
diff --git a/examples/hello_world/android/app/src/main/AndroidManifest.xml b/examples/hello_world/android/AndroidManifest.xml
similarity index 100%
rename from examples/hello_world/android/app/src/main/AndroidManifest.xml
rename to examples/hello_world/android/AndroidManifest.xml
diff --git a/examples/hello_world/android/app/build.gradle b/examples/hello_world/android/app/build.gradle
deleted file mode 100644
index 90c2899..0000000
--- a/examples/hello_world/android/app/build.gradle
+++ /dev/null
@@ -1,46 +0,0 @@
-def localProperties = new Properties()
-def localPropertiesFile = rootProject.file('local.properties')
-if (localPropertiesFile.exists()) {
- localPropertiesFile.withInputStream { stream ->
- localProperties.load(stream)
- }
-}
-
-def flutterRoot = localProperties.getProperty('flutter.sdk')
-if (flutterRoot == null) {
- throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
-}
-
-apply plugin: 'com.android.application'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
-
-android {
- compileSdkVersion 25
- buildToolsVersion '24.0.1'
-
- lintOptions {
- disable 'InvalidPackage'
- }
-
- defaultConfig {
- testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
- }
-
- buildTypes {
- release {
- // TODO: Add your own signing config for the release build.
- // Signing with the debug keys for now, so `flutter run --release` works.
- signingConfig signingConfigs.debug
- }
- }
-}
-
-flutter {
- source '../..'
-}
-
-dependencies {
- androidTestCompile 'com.android.support:support-annotations:25.0.0'
- androidTestCompile 'com.android.support.test:runner:0.5'
- androidTestCompile 'com.android.support.test:rules:0.5'
-}
diff --git a/examples/hello_world/android/build.gradle b/examples/hello_world/android/build.gradle
deleted file mode 100644
index d82a154..0000000
--- a/examples/hello_world/android/build.gradle
+++ /dev/null
@@ -1,23 +0,0 @@
-buildscript {
- repositories {
- jcenter()
- }
-
- dependencies {
- classpath 'com.android.tools.build:gradle:2.2.3'
- }
-}
-
-allprojects {
- repositories {
- jcenter()
- }
-}
-
-task clean(type: Delete) {
- delete rootProject.buildDir
-}
-
-task wrapper(type: Wrapper) {
- gradleVersion = '2.14.1'
-}
diff --git a/examples/hello_world/android/gradle.properties b/examples/hello_world/android/gradle.properties
deleted file mode 100644
index 8bd86f6..0000000
--- a/examples/hello_world/android/gradle.properties
+++ /dev/null
@@ -1 +0,0 @@
-org.gradle.jvmargs=-Xmx1536M
diff --git a/examples/hello_world/android/settings.gradle b/examples/hello_world/android/settings.gradle
deleted file mode 100644
index e7b4def..0000000
--- a/examples/hello_world/android/settings.gradle
+++ /dev/null
@@ -1 +0,0 @@
-include ':app'
diff --git a/examples/platform_services/android/app/build.gradle b/examples/platform_services/android/app/build.gradle
index 90c2899..4e2e46b 100644
--- a/examples/platform_services/android/app/build.gradle
+++ b/examples/platform_services/android/app/build.gradle
@@ -16,7 +16,7 @@
android {
compileSdkVersion 25
- buildToolsVersion '24.0.1'
+ buildToolsVersion '25.0.2'
lintOptions {
disable 'InvalidPackage'
diff --git a/examples/platform_services/android/app/src/main/AndroidManifest.xml b/examples/platform_services/android/app/src/main/AndroidManifest.xml
index 37157b7..772377e 100644
--- a/examples/platform_services/android/app/src/main/AndroidManifest.xml
+++ b/examples/platform_services/android/app/src/main/AndroidManifest.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.example.platformservices"
+ package="com.example.flutter"
android:versionCode="1"
- android:versionName="0.0.1">
+ android:versionName="1.0.0" >
- <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="21" />
+ <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="22" />
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
diff --git a/examples/stocks/android/.gitignore b/examples/stocks/android/.gitignore
deleted file mode 100644
index 5c4ef82..0000000
--- a/examples/stocks/android/.gitignore
+++ /dev/null
@@ -1,12 +0,0 @@
-*.iml
-.gradle
-/local.properties
-/.idea/workspace.xml
-/.idea/libraries
-.DS_Store
-/build
-/captures
-
-/gradle
-/gradlew
-/gradlew.bat
diff --git a/examples/stocks/android/app/src/main/AndroidManifest.xml b/examples/stocks/android/AndroidManifest.xml
similarity index 100%
rename from examples/stocks/android/app/src/main/AndroidManifest.xml
rename to examples/stocks/android/AndroidManifest.xml
diff --git a/examples/stocks/android/app/build.gradle b/examples/stocks/android/app/build.gradle
deleted file mode 100644
index 90c2899..0000000
--- a/examples/stocks/android/app/build.gradle
+++ /dev/null
@@ -1,46 +0,0 @@
-def localProperties = new Properties()
-def localPropertiesFile = rootProject.file('local.properties')
-if (localPropertiesFile.exists()) {
- localPropertiesFile.withInputStream { stream ->
- localProperties.load(stream)
- }
-}
-
-def flutterRoot = localProperties.getProperty('flutter.sdk')
-if (flutterRoot == null) {
- throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
-}
-
-apply plugin: 'com.android.application'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
-
-android {
- compileSdkVersion 25
- buildToolsVersion '24.0.1'
-
- lintOptions {
- disable 'InvalidPackage'
- }
-
- defaultConfig {
- testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
- }
-
- buildTypes {
- release {
- // TODO: Add your own signing config for the release build.
- // Signing with the debug keys for now, so `flutter run --release` works.
- signingConfig signingConfigs.debug
- }
- }
-}
-
-flutter {
- source '../..'
-}
-
-dependencies {
- androidTestCompile 'com.android.support:support-annotations:25.0.0'
- androidTestCompile 'com.android.support.test:runner:0.5'
- androidTestCompile 'com.android.support.test:rules:0.5'
-}
diff --git a/examples/stocks/android/build.gradle b/examples/stocks/android/build.gradle
deleted file mode 100644
index d82a154..0000000
--- a/examples/stocks/android/build.gradle
+++ /dev/null
@@ -1,23 +0,0 @@
-buildscript {
- repositories {
- jcenter()
- }
-
- dependencies {
- classpath 'com.android.tools.build:gradle:2.2.3'
- }
-}
-
-allprojects {
- repositories {
- jcenter()
- }
-}
-
-task clean(type: Delete) {
- delete rootProject.buildDir
-}
-
-task wrapper(type: Wrapper) {
- gradleVersion = '2.14.1'
-}
diff --git a/examples/stocks/android/gradle.properties b/examples/stocks/android/gradle.properties
deleted file mode 100644
index 8bd86f6..0000000
--- a/examples/stocks/android/gradle.properties
+++ /dev/null
@@ -1 +0,0 @@
-org.gradle.jvmargs=-Xmx1536M
diff --git a/examples/stocks/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/examples/stocks/android/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from examples/stocks/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
rename to examples/stocks/android/res/mipmap-hdpi/ic_launcher.png
Binary files differ
diff --git a/examples/stocks/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/examples/stocks/android/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from examples/stocks/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
rename to examples/stocks/android/res/mipmap-mdpi/ic_launcher.png
Binary files differ
diff --git a/examples/stocks/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/examples/stocks/android/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from examples/stocks/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
rename to examples/stocks/android/res/mipmap-xhdpi/ic_launcher.png
Binary files differ
diff --git a/examples/stocks/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/examples/stocks/android/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from examples/stocks/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
rename to examples/stocks/android/res/mipmap-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/examples/stocks/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/examples/stocks/android/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from examples/stocks/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
rename to examples/stocks/android/res/mipmap-xxxhdpi/ic_launcher.png
Binary files differ
diff --git a/examples/stocks/android/settings.gradle b/examples/stocks/android/settings.gradle
deleted file mode 100644
index e7b4def..0000000
--- a/examples/stocks/android/settings.gradle
+++ /dev/null
@@ -1 +0,0 @@
-include ':app'
