From d6527451a013522da43f51bf444d21ee3a7a1df9 Mon Sep 17 00:00:00 2001 From: Yegor Date: Wed, 15 Feb 2017 09:44:44 -0800 Subject: [PATCH] Revert "Update /examples/ to new gradle based build flow (#8173)" (#8177) This reverts commit 8da4778e1d36111e39829d88edbe91dc041368f4. --- examples/flutter_gallery/android/.gitignore | 12 ----- .../{app/src/main => }/AndroidManifest.xml | 0 .../flutter_gallery/android/app/build.gradle | 46 ------------------ examples/flutter_gallery/android/build.gradle | 23 --------- .../flutter_gallery/android/gradle.properties | 1 - .../main => }/res/mipmap-hdpi/ic_launcher.png | Bin .../main => }/res/mipmap-mdpi/ic_launcher.png | Bin .../res/mipmap-xhdpi/ic_launcher.png | Bin .../res/mipmap-xxhdpi/ic_launcher.png | Bin .../res/mipmap-xxxhdpi/ic_launcher.png | Bin .../flutter_gallery/android/settings.gradle | 1 - .../hello_services/android/app/build.gradle | 2 +- examples/hello_world/android/.gitignore | 12 ----- .../{app/src/main => }/AndroidManifest.xml | 0 examples/hello_world/android/app/build.gradle | 46 ------------------ examples/hello_world/android/build.gradle | 23 --------- .../hello_world/android/gradle.properties | 1 - examples/hello_world/android/settings.gradle | 1 - .../android/app/build.gradle | 2 +- .../android/app/src/main/AndroidManifest.xml | 6 +-- examples/stocks/android/.gitignore | 12 ----- .../{app/src/main => }/AndroidManifest.xml | 0 examples/stocks/android/app/build.gradle | 46 ------------------ examples/stocks/android/build.gradle | 23 --------- examples/stocks/android/gradle.properties | 1 - .../main => }/res/mipmap-hdpi/ic_launcher.png | Bin .../main => }/res/mipmap-mdpi/ic_launcher.png | Bin .../res/mipmap-xhdpi/ic_launcher.png | Bin .../res/mipmap-xxhdpi/ic_launcher.png | Bin .../res/mipmap-xxxhdpi/ic_launcher.png | Bin examples/stocks/android/settings.gradle | 1 - 31 files changed, 5 insertions(+), 254 deletions(-) delete mode 100644 examples/flutter_gallery/android/.gitignore rename examples/flutter_gallery/android/{app/src/main => }/AndroidManifest.xml (100%) delete mode 100644 examples/flutter_gallery/android/app/build.gradle delete mode 100644 examples/flutter_gallery/android/build.gradle delete mode 100644 examples/flutter_gallery/android/gradle.properties rename examples/flutter_gallery/android/{app/src/main => }/res/mipmap-hdpi/ic_launcher.png (100%) rename examples/flutter_gallery/android/{app/src/main => }/res/mipmap-mdpi/ic_launcher.png (100%) rename examples/flutter_gallery/android/{app/src/main => }/res/mipmap-xhdpi/ic_launcher.png (100%) rename examples/flutter_gallery/android/{app/src/main => }/res/mipmap-xxhdpi/ic_launcher.png (100%) rename examples/flutter_gallery/android/{app/src/main => }/res/mipmap-xxxhdpi/ic_launcher.png (100%) delete mode 100644 examples/flutter_gallery/android/settings.gradle delete mode 100644 examples/hello_world/android/.gitignore rename examples/hello_world/android/{app/src/main => }/AndroidManifest.xml (100%) delete mode 100644 examples/hello_world/android/app/build.gradle delete mode 100644 examples/hello_world/android/build.gradle delete mode 100644 examples/hello_world/android/gradle.properties delete mode 100644 examples/hello_world/android/settings.gradle delete mode 100644 examples/stocks/android/.gitignore rename examples/stocks/android/{app/src/main => }/AndroidManifest.xml (100%) delete mode 100644 examples/stocks/android/app/build.gradle delete mode 100644 examples/stocks/android/build.gradle delete mode 100644 examples/stocks/android/gradle.properties rename examples/stocks/android/{app/src/main => }/res/mipmap-hdpi/ic_launcher.png (100%) rename examples/stocks/android/{app/src/main => }/res/mipmap-mdpi/ic_launcher.png (100%) rename examples/stocks/android/{app/src/main => }/res/mipmap-xhdpi/ic_launcher.png (100%) rename examples/stocks/android/{app/src/main => }/res/mipmap-xxhdpi/ic_launcher.png (100%) rename examples/stocks/android/{app/src/main => }/res/mipmap-xxxhdpi/ic_launcher.png (100%) delete mode 100644 examples/stocks/android/settings.gradle diff --git a/examples/flutter_gallery/android/.gitignore b/examples/flutter_gallery/android/.gitignore deleted file mode 100644 index 5c4ef82869b..00000000000 --- 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 90c289901dc..00000000000 --- 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 d82a1548b98..00000000000 --- 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 8bd86f68051..00000000000 --- 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 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 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 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 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 diff --git a/examples/flutter_gallery/android/settings.gradle b/examples/flutter_gallery/android/settings.gradle deleted file mode 100644 index e7b4def49cb..00000000000 --- 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 90c289901dc..a8a6695f609 100644 --- a/examples/hello_services/android/app/build.gradle +++ b/examples/hello_services/android/app/build.gradle @@ -16,7 +16,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" 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 5c4ef82869b..00000000000 --- 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 90c289901dc..00000000000 --- 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 d82a1548b98..00000000000 --- 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 8bd86f68051..00000000000 --- 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 e7b4def49cb..00000000000 --- 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 90c289901dc..4e2e46b56c2 100644 --- a/examples/platform_services/android/app/build.gradle +++ b/examples/platform_services/android/app/build.gradle @@ -16,7 +16,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" 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 37157b749a7..772377e0e88 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 @@ + android:versionName="1.0.0" > - + diff --git a/examples/stocks/android/.gitignore b/examples/stocks/android/.gitignore deleted file mode 100644 index 5c4ef82869b..00000000000 --- 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 90c289901dc..00000000000 --- 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 d82a1548b98..00000000000 --- 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 8bd86f68051..00000000000 --- 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 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 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 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 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 diff --git a/examples/stocks/android/settings.gradle b/examples/stocks/android/settings.gradle deleted file mode 100644 index e7b4def49cb..00000000000 --- a/examples/stocks/android/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -include ':app'