Skip to content

Commit

Permalink
Flutter 3.3.9 update (flutter#1196)
Browse files Browse the repository at this point in the history
* Tooling update

* Revert `tooling/codelab_rebuild/.vscode/launch.json`

* Add 7zip support and various bug fixes

* Update codelabs for Flutter 3.3.9

* fix

* Fixup for linux
  • Loading branch information
domesticmouse authored Nov 29, 2022
1 parent 0d0d67d commit 729f23a
Show file tree
Hide file tree
Showing 312 changed files with 5,780 additions and 168 deletions.
41 changes: 40 additions & 1 deletion adaptive_app/codelab_rebuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -177,15 +177,28 @@ steps:
});
}
- name: Build iOS simulator bundle
platforms: [ macos ]
path: adaptive_app
flutter: build ios --simulator
- name: Build macOS app
platforms: [ macos ]
path: adaptive_app
flutter: build macos
- name: Build Linux app
platforms: [ linux ]
path: adaptive_app
flutter: build linux
- name: Build Windows app
platforms: [ windows ]
path: adaptive_app
flutter: build windows
- name: Copy step_03
copydir:
from: adaptive_app
to: step_03
- name: Flutter clean
path: step_03
flutter: clean
- name: step_04
steps:
- name: Remove generated code.
Expand Down Expand Up @@ -653,9 +666,11 @@ steps:
});
}
- name: Rebuild ios/Podfile.lock
platforms: [ macos ]
path: adaptive_app/ios
pod: update
- name: Rebuild macos/Podfile.lock
platforms: [ macos ]
path: adaptive_app/macos
pod: update
- name: Copy step_04
Expand Down Expand Up @@ -988,7 +1003,7 @@ steps:
dart: create --template server-shelf yt_cors_proxy
- name: Remove args
path: adaptive_app/yt_cors_proxy
dart: pub remove args shelf_router test_process test
dart: pub remove args shelf_router test
- name: Add http shelf_cors_headers
path: adaptive_app/yt_cors_proxy
dart: pub add http shelf_cors_headers
Expand Down Expand Up @@ -1651,14 +1666,38 @@ steps:
<title>adaptive_app</title>
<link rel="manifest" href="manifest.json">
- name: Rebuild ios/Podfile.lock
platforms: [ macos ]
path: adaptive_app/ios
pod: update
- name: Rebuild macos/Podfile.lock
platforms: [ macos ]
path: adaptive_app/macos
pod: update
- name: Build iOS simulator bundle
platforms: [ macos ]
path: adaptive_app
flutter: build ios --simulator
- name: Build macOS app
platforms: [ macos ]
path: adaptive_app
flutter: build macos
- name: Build Linux app
platforms: [ linux ]
path: adaptive_app
flutter: build linux
- name: Build Windows app
platforms: [ windows ]
path: adaptive_app
flutter: build windows
- name: Build Web app
path: adaptive_app
flutter: build web
- name: Copy step_07
copydir:
from: adaptive_app
to: step_07
- name: Flutter clean
path: step_07
flutter: clean
- name: Cleanup
rmdir: adaptive_app
2 changes: 1 addition & 1 deletion adaptive_app/step_03/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
version: 1.0.0+1

environment:
sdk: '>=2.18.2 <3.0.0'
sdk: '>=2.18.5 <3.0.0'

# Dependencies specify other packages that your package needs in order to work.
# To automatically upgrade your package dependencies to the latest versions
Expand Down
6 changes: 3 additions & 3 deletions adaptive_app/step_04/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
version: 1.0.0+1

environment:
sdk: '>=2.18.2 <3.0.0'
sdk: '>=2.18.5 <3.0.0'

# Dependencies specify other packages that your package needs in order to work.
# To automatically upgrade your package dependencies to the latest versions
Expand All @@ -39,8 +39,8 @@ dependencies:
googleapis: ^9.2.0
http: ^0.13.5
provider: ^6.0.4
url_launcher: ^6.1.6
flex_color_scheme: ^6.0.1
url_launcher: ^6.1.7
flex_color_scheme: ^6.1.1

dev_dependencies:
flutter_test:
Expand Down
6 changes: 3 additions & 3 deletions adaptive_app/step_05/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
version: 1.0.0+1

environment:
sdk: '>=2.18.2 <3.0.0'
sdk: '>=2.18.5 <3.0.0'

# Dependencies specify other packages that your package needs in order to work.
# To automatically upgrade your package dependencies to the latest versions
Expand All @@ -39,8 +39,8 @@ dependencies:
googleapis: ^9.2.0
http: ^0.13.5
provider: ^6.0.4
url_launcher: ^6.1.6
flex_color_scheme: ^6.0.1
url_launcher: ^6.1.7
flex_color_scheme: ^6.1.1
split_view: ^3.2.1

dev_dependencies:
Expand Down
6 changes: 3 additions & 3 deletions adaptive_app/step_06/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
version: 1.0.0+1

environment:
sdk: '>=2.18.2 <3.0.0'
sdk: '>=2.18.5 <3.0.0'

# Dependencies specify other packages that your package needs in order to work.
# To automatically upgrade your package dependencies to the latest versions
Expand All @@ -39,8 +39,8 @@ dependencies:
googleapis: ^9.2.0
http: ^0.13.5
provider: ^6.0.4
url_launcher: ^6.1.6
flex_color_scheme: ^6.0.1
url_launcher: ^6.1.7
flex_color_scheme: ^6.1.1
split_view: ^3.2.1

dev_dependencies:
Expand Down
2 changes: 1 addition & 1 deletion adaptive_app/step_06/yt_cors_proxy/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description: A YouTube CORS Proxy Server.
version: 1.0.0

environment:
sdk: '>=2.18.2 <3.0.0'
sdk: '>=2.18.5 <3.0.0'

dependencies:
http: ^0.13.5
Expand Down
6 changes: 3 additions & 3 deletions adaptive_app/step_07/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
version: 1.0.0+1

environment:
sdk: '>=2.18.2 <3.0.0'
sdk: '>=2.18.5 <3.0.0'

# Dependencies specify other packages that your package needs in order to work.
# To automatically upgrade your package dependencies to the latest versions
Expand All @@ -39,8 +39,8 @@ dependencies:
googleapis: ^9.2.0
http: ^0.13.5
provider: ^6.0.4
url_launcher: ^6.1.6
flex_color_scheme: ^6.0.1
url_launcher: ^6.1.7
flex_color_scheme: ^6.1.1
split_view: ^3.2.1
googleapis_auth: ^1.3.1
google_sign_in: ^5.4.2
Expand Down
2 changes: 1 addition & 1 deletion adaptive_app/step_07/yt_cors_proxy/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description: A YouTube CORS Proxy Server.
version: 1.0.0

environment:
sdk: '>=2.18.2 <3.0.0'
sdk: '>=2.18.5 <3.0.0'

dependencies:
http: ^0.13.5
Expand Down
41 changes: 40 additions & 1 deletion boring_to_beautiful/codelab_rebuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ steps:
- name: Remove generated code.
rmdir: step_01
- name: Create project.
flutter: create --platforms ios,web,windows,macos myartist
flutter: create myartist
- name: Configure analysis_options.yaml
path: myartist/analysis_options.yaml
replace-contents: |
Expand Down Expand Up @@ -73048,15 +73048,28 @@ steps:
path: myartist
flutter: pub run build_runner build
- name: Build iOS simulator bundle
platforms: [ macos ]
path: myartist
flutter: build ios --simulator
- name: Build macOS app
platforms: [ macos ]
path: myartist
flutter: build macos
- name: Build Linux app
platforms: [ linux ]
path: myartist
flutter: build linux
- name: Build Windows app
platforms: [ windows ]
path: myartist
flutter: build windows
- name: Copy step_01
copydir:
from: myartist
to: step_01
- name: Flutter clean
path: step_01
flutter: clean
- name: step_02
steps:
- name: Remove generated code.
Expand Down Expand Up @@ -73520,9 +73533,35 @@ steps:
),
);
}
- name: Build Android app
platforms: [ macos ]
path: myartist
flutter: build apk
- name: Build iOS app
platforms: [ macos ]
path: myartist
flutter: build ios
- name: Build macOS app
platforms: [ macos ]
path: myartist
flutter: build macos
- name: Build Linux app
platforms: [ linux ]
path: myartist
flutter: build linux
- name: Build Windows app
platforms: [ windows ]
path: myartist
flutter: build windows
- name: Build Web app
path: myartist
flutter: build web
- name: Copy final
copydir:
from: myartist
to: final
- name: Flutter clean
path: final
flutter: clean
- name: Cleanup
rmdir: myartist
13 changes: 13 additions & 0 deletions boring_to_beautiful/final/android/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
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
71 changes: 71 additions & 0 deletions boring_to_beautiful/final/android/app/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
def localProperties = new Properties()
def localPropertiesFile = rootProject.file('local.properties')
if (localPropertiesFile.exists()) {
localPropertiesFile.withReader('UTF-8') { reader ->
localProperties.load(reader)
}
}

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.")
}

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
ndkVersion flutter.ndkVersion

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}

kotlinOptions {
jvmTarget = '1.8'
}

sourceSets {
main.java.srcDirs += 'src/main/kotlin'
}

defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "com.example.myartist"
// You can update the following values to match your application needs.
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration.
minSdkVersion flutter.minSdkVersion
targetSdkVersion flutter.targetSdkVersion
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
}

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 {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.myartist">
<!-- The INTERNET permission is required for development. Specifically,
the Flutter tool needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc.
-->
<uses-permission android:name="android.permission.INTERNET"/>
</manifest>
34 changes: 34 additions & 0 deletions boring_to_beautiful/final/android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.myartist">
<application
android:label="myartist"
android:name="${applicationName}"
android:icon="@mipmap/ic_launcher">
<activity
android:name=".MainActivity"
android:exported="true"
android:launchMode="singleTop"
android:theme="@style/LaunchTheme"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
android:hardwareAccelerated="true"
android:windowSoftInputMode="adjustResize">
<!-- Specifies an Android theme to apply to this Activity as soon as
the Android process has started. This theme is visible to the user
while the Flutter UI initializes. After that, this theme continues
to determine the Window background behind the Flutter UI. -->
<meta-data
android:name="io.flutter.embedding.android.NormalTheme"
android:resource="@style/NormalTheme"
/>
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
<!-- Don't delete the meta-data below.
This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
<meta-data
android:name="flutterEmbedding"
android:value="2" />
</application>
</manifest>
Loading

0 comments on commit 729f23a

Please sign in to comment.