From 693f89372e412a983cdb178d8d261b679da6ec8b Mon Sep 17 00:00:00 2001 From: Dao Hoang Son Date: Thu, 16 May 2024 00:03:43 +0700 Subject: [PATCH] `./tool/update-demo_app-files.sh` --- demo_app/.metadata | 22 ++++---- demo_app/android/app/build.gradle | 51 ++++++++----------- .../android/app/src/main/AndroidManifest.xml | 3 +- demo_app/android/build.gradle | 4 +- demo_app/android/gradle.properties | 2 +- demo_app/android/settings.gradle | 5 +- demo_app/ios/Runner/AppDelegate.swift | 2 +- demo_app/macos/RunnerTests/RunnerTests.swift | 2 +- demo_app/pubspec.lock | 10 ++-- demo_app/web/index.html | 23 +-------- 10 files changed, 46 insertions(+), 78 deletions(-) diff --git a/demo_app/.metadata b/demo_app/.metadata index 1e4b5bac0..ec6f49863 100644 --- a/demo_app/.metadata +++ b/demo_app/.metadata @@ -4,7 +4,7 @@ # This file should be version controlled and should not be manually edited. version: - revision: "54e66469a933b60ddf175f858f82eaeb97e48c8d" + revision: "5dcb86f68f239346676ceb1ed1ea385bd215fba1" channel: "stable" project_type: app @@ -13,20 +13,20 @@ project_type: app migration: platforms: - platform: root - create_revision: 54e66469a933b60ddf175f858f82eaeb97e48c8d - base_revision: 54e66469a933b60ddf175f858f82eaeb97e48c8d + create_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1 + base_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1 - platform: android - create_revision: 54e66469a933b60ddf175f858f82eaeb97e48c8d - base_revision: 54e66469a933b60ddf175f858f82eaeb97e48c8d + create_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1 + base_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1 - platform: ios - create_revision: 54e66469a933b60ddf175f858f82eaeb97e48c8d - base_revision: 54e66469a933b60ddf175f858f82eaeb97e48c8d + create_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1 + base_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1 - platform: macos - create_revision: 54e66469a933b60ddf175f858f82eaeb97e48c8d - base_revision: 54e66469a933b60ddf175f858f82eaeb97e48c8d + create_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1 + base_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1 - platform: web - create_revision: 54e66469a933b60ddf175f858f82eaeb97e48c8d - base_revision: 54e66469a933b60ddf175f858f82eaeb97e48c8d + create_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1 + base_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1 # User provided section diff --git a/demo_app/android/app/build.gradle b/demo_app/android/app/build.gradle index fd0545ddd..5315a3a98 100644 --- a/demo_app/android/app/build.gradle +++ b/demo_app/android/app/build.gradle @@ -1,58 +1,47 @@ plugins { id "com.android.application" id "kotlin-android" + // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. id "dev.flutter.flutter-gradle-plugin" } def localProperties = new Properties() -def localPropertiesFile = rootProject.file('local.properties') +def localPropertiesFile = rootProject.file("local.properties") if (localPropertiesFile.exists()) { - localPropertiesFile.withReader('UTF-8') { reader -> + localPropertiesFile.withReader("UTF-8") { reader -> localProperties.load(reader) } } -def flutterVersionCode = localProperties.getProperty('flutter.versionCode') +def flutterVersionCode = localProperties.getProperty("flutter.versionCode") if (flutterVersionCode == null) { - flutterVersionCode = '1' + flutterVersionCode = "1" } -def flutterVersionName = localProperties.getProperty('flutter.versionName') +def flutterVersionName = localProperties.getProperty("flutter.versionName") if (flutterVersionName == null) { - flutterVersionName = '1.0' + flutterVersionName = "1.0" } android { - namespace "dev.fwfh.demo_app" - compileSdk flutter.compileSdkVersion + namespace = "dev.fwfh.demo_app" + compileSdk = flutter.compileSdkVersion // TODO: remove hard-coded value when `flutter.ndkVersion` is sufficient // open $(dirname $(dirname $(which flutter)))/packages/flutter_tools - ndkVersion "26.1.10909125" + ndkVersion = "26.1.10909125" 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_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 } defaultConfig { - applicationId "dev.fwfh.demo_app" - - // TODO: remove hard-coded value when `flutter.minSdkVersion` is sufficient - // open $(dirname $(dirname $(which flutter)))/packages/flutter_tools - minSdkVersion 21 - - targetSdkVersion flutter.targetSdkVersion - versionCode flutterVersionCode.toInteger() - versionName flutterVersionName + applicationId = "dev.fwfh.demo_app" + minSdk = flutter.minSdkVersion + targetSdk = flutter.targetSdkVersion + versionCode = flutterVersionCode.toInteger() + versionName = flutterVersionName // https://patrol.leancode.co/getting-started testInstrumentationRunner "pl.leancode.patrol.PatrolJUnitRunner" @@ -70,10 +59,10 @@ android { buildTypes { debug { - signingConfig signingConfigs.demo + signingConfig = signingConfigs.demo } release { - signingConfig signingConfigs.demo + signingConfig = signingConfigs.demo } } @@ -84,7 +73,7 @@ android { } flutter { - source '../..' + source = "../.." } dependencies { diff --git a/demo_app/android/app/src/main/AndroidManifest.xml b/demo_app/android/app/src/main/AndroidManifest.xml index 027bb8afb..dc0c7f216 100644 --- a/demo_app/android/app/src/main/AndroidManifest.xml +++ b/demo_app/android/app/src/main/AndroidManifest.xml @@ -9,6 +9,7 @@ android:name=".MainActivity" android:exported="true" android:launchMode="singleTop" + android:taskAffinity="" android:theme="@style/LaunchTheme" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode" android:hardwareAccelerated="true" @@ -33,7 +34,7 @@ android:value="2" /> diff --git a/demo_app/android/build.gradle b/demo_app/android/build.gradle index bc157bd1a..d2ffbffa4 100644 --- a/demo_app/android/build.gradle +++ b/demo_app/android/build.gradle @@ -5,12 +5,12 @@ allprojects { } } -rootProject.buildDir = '../build' +rootProject.buildDir = "../build" subprojects { project.buildDir = "${rootProject.buildDir}/${project.name}" } subprojects { - project.evaluationDependsOn(':app') + project.evaluationDependsOn(":app") } tasks.register("clean", Delete) { diff --git a/demo_app/android/gradle.properties b/demo_app/android/gradle.properties index 598d13fee..3b5b324f6 100644 --- a/demo_app/android/gradle.properties +++ b/demo_app/android/gradle.properties @@ -1,3 +1,3 @@ -org.gradle.jvmargs=-Xmx4G +org.gradle.jvmargs=-Xmx4G -XX:+HeapDumpOnOutOfMemoryError android.useAndroidX=true android.enableJetifier=true diff --git a/demo_app/android/settings.gradle b/demo_app/android/settings.gradle index 8dee7b83e..2054f554f 100644 --- a/demo_app/android/settings.gradle +++ b/demo_app/android/settings.gradle @@ -5,10 +5,9 @@ pluginManagement { def flutterSdkPath = properties.getProperty("flutter.sdk") assert flutterSdkPath != null, "flutter.sdk not set in local.properties" return flutterSdkPath - } - settings.ext.flutterSdkPath = flutterSdkPath() + }() - includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle") + includeBuild("$flutterSdkPath/packages/flutter_tools/gradle") repositories { google() diff --git a/demo_app/ios/Runner/AppDelegate.swift b/demo_app/ios/Runner/AppDelegate.swift index 70693e4a8..9074fee92 100644 --- a/demo_app/ios/Runner/AppDelegate.swift +++ b/demo_app/ios/Runner/AppDelegate.swift @@ -1,5 +1,5 @@ -import UIKit import Flutter +import UIKit @UIApplicationMain @objc class AppDelegate: FlutterAppDelegate { diff --git a/demo_app/macos/RunnerTests/RunnerTests.swift b/demo_app/macos/RunnerTests/RunnerTests.swift index 5418c9f53..61f3bd1fc 100644 --- a/demo_app/macos/RunnerTests/RunnerTests.swift +++ b/demo_app/macos/RunnerTests/RunnerTests.swift @@ -1,5 +1,5 @@ -import FlutterMacOS import Cocoa +import FlutterMacOS import XCTest class RunnerTests: XCTestCase { diff --git a/demo_app/pubspec.lock b/demo_app/pubspec.lock index c0d9d13ea..85b41fb5c 100644 --- a/demo_app/pubspec.lock +++ b/demo_app/pubspec.lock @@ -1105,18 +1105,18 @@ packages: dependency: transitive description: name: webview_flutter_wkwebview - sha256: f12f8d8a99784b863e8b85e4a9a5e3cf1839d6803d2c0c3e0533a8f3c5a992a7 + sha256: "7affdf9d680c015b11587181171d3cad8093e449db1f7d9f0f08f4f33d24f9a0" url: "https://pub.dev" source: hosted - version: "3.13.0" + version: "3.13.1" win32: dependency: transitive description: name: win32 - sha256: "0eaf06e3446824099858367950a813472af675116bf63f008a4c2a75ae13e9cb" + sha256: a79dbe579cb51ecd6d30b17e0cae4e0ea15e2c0e66f69ad4198f22a6789e94f4 url: "https://pub.dev" source: hosted - version: "5.5.0" + version: "5.5.1" xdg_directories: dependency: transitive description: @@ -1142,5 +1142,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.3.0 <4.0.0" + dart: ">=3.4.0 <4.0.0" flutter: ">=3.19.0" diff --git a/demo_app/web/index.html b/demo_app/web/index.html index d4dec595b..339f2cfcd 100644 --- a/demo_app/web/index.html +++ b/demo_app/web/index.html @@ -31,29 +31,8 @@ demo_app - - - - - +