Rebuild plugin_codelab (flutter#58)

domesticmouse · web-flow · commit 2ed9028ea264 · 2021-01-27T09:02:13.000+11:00
diff --git a/flutter_ci_script_beta.sh b/flutter_ci_script_beta.sh
@@ -17,19 +17,22 @@ cd ./plugin_codelab
 $FLUTTER format --dry-run --set-exit-if-changed .;
 popd
 
-declare -ar CODELABS=(
+declare -a CODELABS=(
   "add_flutter_to_android_app"
   "cupertino_store"
   "firebase-get-to-know-flutter"
   "github-graphql-client"
   "google-maps-in-flutter"
-  # Plugin codelab's example project is unhappy with ubuntu-latest 
-  # "plugin_codelab"
   "startup_namer"
-  # Tracking issue: https://github.com/flutter/flutter/issues/74209	
-  # "testing_codelab"  
+  # Tracking issue: https://github.com/flutter/flutter/issues/74209
+  # "testing_codelab"
   )
 
+# Plugin codelab is failing on ubuntu-latest in CI.
+if [[ "$OSTYPE" != "linux-gnu"* ]]; then
+  CODELABS+=("plugin_codelab")
+fi
+
 declare -a PROJECT_PATHS=($(
   for CODELAB in "${CODELABS[@]}"
   do 
diff --git a/flutter_ci_script_dev.sh b/flutter_ci_script_dev.sh
@@ -17,19 +17,22 @@ cd ./plugin_codelab
 $FLUTTER format --dry-run --set-exit-if-changed .;
 popd
 
-declare -ar CODELABS=(
+declare -a CODELABS=(
   "add_flutter_to_android_app"
   "cupertino_store"
   "firebase-get-to-know-flutter"
   "github-graphql-client"
   "google-maps-in-flutter"
-  # Plugin codelab's example project is unhappy with ubuntu-latest 
-  # "plugin_codelab"
   "startup_namer"
-  # Tracking issue: https://github.com/flutter/flutter/issues/74209	
-  # "testing_codelab"  
+  # Tracking issue: https://github.com/flutter/flutter/issues/74209
+  # "testing_codelab"
   )
 
+# Plugin codelab is failing on ubuntu-latest in CI.
+if [[ "$OSTYPE" != "linux-gnu"* ]]; then
+  CODELABS+=("plugin_codelab")
+fi
+
 declare -a PROJECT_PATHS=($(
   for CODELAB in "${CODELABS[@]}"
   do 
diff --git a/flutter_ci_script_stable.sh b/flutter_ci_script_stable.sh
@@ -17,18 +17,21 @@ cd ./plugin_codelab
 $FLUTTER format --dry-run --set-exit-if-changed .;
 popd
 
-declare -ar CODELABS=(
+declare -a CODELABS=(
   "add_flutter_to_android_app"
   "cupertino_store"
   "firebase-get-to-know-flutter"
   "github-graphql-client"
   "google-maps-in-flutter"
-  # Plugin codelab's example project is unhappy with ubuntu-latest 
-  # "plugin_codelab"
   "startup_namer"
   "testing_codelab"
   )
 
+# Plugin codelab is failing on ubuntu-latest in CI.
+if [[ "$OSTYPE" != "linux-gnu"* ]]; then
+  CODELABS+=("plugin_codelab")
+fi
+
 declare -a PROJECT_PATHS=($(
   for CODELAB in "${CODELABS[@]}"
   do 
diff --git a/plugin_codelab/.idea/libraries/Dart_SDK.xml b/plugin_codelab/.idea/libraries/Dart_SDK.xml
diff --git a/plugin_codelab/android/build.gradle b/plugin_codelab/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:4.1.0'
     }
 }
 
@@ -22,12 +22,9 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 30
 
     defaultConfig {
         minSdkVersion 16
     }
-    lintOptions {
-        disable 'InvalidPackage'
-    }
 }
diff --git a/plugin_codelab/android/gradle/wrapper/gradle-wrapper.properties b/plugin_codelab/android/gradle/wrapper/gradle-wrapper.properties
@@ -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-5.6.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
diff --git a/plugin_codelab/example/.gitignore b/plugin_codelab/example/.gitignore
@@ -39,3 +39,8 @@ app.*.symbols
 
 # Obfuscation related
 app.*.map.json
+
+# Android Studio will place build artifacts here
+/android/app/debug
+/android/app/profile
+/android/app/release
diff --git a/plugin_codelab/example/README.md b/plugin_codelab/example/README.md
@@ -1,6 +1,6 @@
-# PluginCodelab_example
+# plugin_codelab_example
 
-Demonstrates how to use the PluginCodelab plugin.
+Demonstrates how to use the plugin_codelab plugin.
 
 ## Getting Started
 
diff --git a/plugin_codelab/example/android/app/build.gradle b/plugin_codelab/example/android/app/build.gradle
@@ -25,17 +25,13 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 29
-
-    lintOptions {
-        disable 'InvalidPackage'
-    }
+    compileSdkVersion 30
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.example.plugin_codelab_example"
         minSdkVersion 16
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }
diff --git a/plugin_codelab/example/android/app/src/main/AndroidManifest.xml b/plugin_codelab/example/android/app/src/main/AndroidManifest.xml
@@ -1,12 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.example.plugin_codelab_example">
-    <!-- io.flutter.app.FlutterApplication is an android.app.Application that
-         calls FlutterMain.startInitialization(this); in its onCreate method.
-         In most cases you can leave this as-is, but you if you want to provide
-         additional functionality it is fine to subclass or reimplement
-         FlutterApplication and put your custom class here. -->
-    <application
-        android:name="io.flutter.app.FlutterApplication"
+   <application
         android:label="plugin_codelab_example"
         android:icon="@mipmap/ic_launcher">
         <activity
diff --git a/plugin_codelab/example/android/app/src/main/res/drawable-v21/launch_background.xml b/plugin_codelab/example/android/app/src/main/res/drawable-v21/launch_background.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Modify this file to customize your launch splash screen -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="?android:colorBackground" />
+
+    <!-- You can insert your own image assets here -->
+    <!-- <item>
+        <bitmap
+            android:gravity="center"
+            android:src="@mipmap/launch_image" />
+    </item> -->
+</layer-list>
diff --git a/plugin_codelab/example/android/app/src/main/res/values-night/styles.xml b/plugin_codelab/example/android/app/src/main/res/values-night/styles.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
+    <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <!-- Show a splash screen on the activity. Automatically removed when
+             Flutter draws its first frame -->
+        <item name="android:windowBackground">@drawable/launch_background</item>
+    </style>
+    <!-- Theme applied to the Android Window as soon as the process has started.
+         This theme determines the color of the Android Window while your
+         Flutter UI initializes, as well as behind your Flutter UI while its
+         running.
+         
+         This Theme is only used starting with V2 of Flutter's Android embedding. -->
+    <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <item name="android:windowBackground">?android:colorBackground</item>
+    </style>
+</resources>
diff --git a/plugin_codelab/example/android/app/src/main/res/values/styles.xml b/plugin_codelab/example/android/app/src/main/res/values/styles.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Theme applied to the Android Window while the process is starting -->
-    <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
+    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
+    <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
         <!-- Show a splash screen on the activity. Automatically removed when
              Flutter draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
@@ -12,7 +12,7 @@
          running.
          
          This Theme is only used starting with V2 of Flutter's Android embedding. -->
-    <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
-        <item name="android:windowBackground">@android:color/white</item>
+    <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
+        <item name="android:windowBackground">?android:colorBackground</item>
     </style>
 </resources>
diff --git a/plugin_codelab/example/android/build.gradle b/plugin_codelab/example/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:4.1.0'
     }
 }
 
diff --git a/plugin_codelab/example/android/gradle.properties b/plugin_codelab/example/android/gradle.properties
@@ -1,4 +1,3 @@
 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
-android.enableR8=true
diff --git a/plugin_codelab/example/android/gradle/wrapper/gradle-wrapper.properties b/plugin_codelab/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
diff --git a/plugin_codelab/example/ios/Flutter/AppFrameworkInfo.plist b/plugin_codelab/example/ios/Flutter/AppFrameworkInfo.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
   <key>CFBundleDevelopmentRegion</key>
-  <string>$(DEVELOPMENT_LANGUAGE)</string>
+  <string>en</string>
   <key>CFBundleExecutable</key>
   <string>App</string>
   <key>CFBundleIdentifier</key>
diff --git a/plugin_codelab/example/ios/Flutter/Debug.xcconfig b/plugin_codelab/example/ios/Flutter/Debug.xcconfig
@@ -1,2 +1 @@
-#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
 #include "Generated.xcconfig"
diff --git a/plugin_codelab/example/ios/Flutter/Release.xcconfig b/plugin_codelab/example/ios/Flutter/Release.xcconfig
@@ -1,2 +1 @@
-#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
 #include "Generated.xcconfig"
diff --git a/plugin_codelab/example/ios/Runner.xcodeproj/project.pbxproj b/plugin_codelab/example/ios/Runner.xcodeproj/project.pbxproj
diff --git a/plugin_codelab/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/plugin_codelab/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/plugin_codelab/example/ios/Runner.xcworkspace/contents.xcworkspacedata b/plugin_codelab/example/ios/Runner.xcworkspace/contents.xcworkspacedata
diff --git a/plugin_codelab/example/pubspec.lock b/plugin_codelab/example/pubspec.lock
diff --git a/plugin_codelab/pubspec.lock b/plugin_codelab/pubspec.lock

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ buildscript {`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`dependencies {`
`11`		`- classpath 'com.android.tools.build:gradle:3.5.0'`
	`11`	`+ classpath 'com.android.tools.build:gradle:4.1.0'`
`12`	`12`	`}`
`13`	`13`	`}`
`14`	`14`
`@@ -22,12 +22,9 @@ rootProject.allprojects {`
`22`	`22`	`apply plugin: 'com.android.library'`
`23`	`23`
`24`	`24`	`android {`
`25`		`- compileSdkVersion 29`
	`25`	`+ compileSdkVersion 30`
`26`	`26`
`27`	`27`	`defaultConfig {`
`28`	`28`	`minSdkVersion 16`
`29`	`29`	`}`
`30`		`- lintOptions {`
`31`		`- disable 'InvalidPackage'`
`32`		`- }`
`33`	`30`	`}`