Skip to content

Commit 817183b

Browse files
committed
./tool/update-demo_app-files.sh
1 parent e6e20b3 commit 817183b

File tree

26 files changed

+253
-319
lines changed

26 files changed

+253
-319
lines changed

demo_app/.metadata

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# This file should be version controlled and should not be manually edited.
55

66
version:
7-
revision: "80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819"
7+
revision: "077b4a4ce10a07b82caa6897f0c626f9c0a3ac90"
88
channel: "stable"
99

1010
project_type: app
@@ -13,20 +13,20 @@ project_type: app
1313
migration:
1414
platforms:
1515
- platform: root
16-
create_revision: 80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819
17-
base_revision: 80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819
16+
create_revision: 077b4a4ce10a07b82caa6897f0c626f9c0a3ac90
17+
base_revision: 077b4a4ce10a07b82caa6897f0c626f9c0a3ac90
1818
- platform: android
19-
create_revision: 80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819
20-
base_revision: 80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819
19+
create_revision: 077b4a4ce10a07b82caa6897f0c626f9c0a3ac90
20+
base_revision: 077b4a4ce10a07b82caa6897f0c626f9c0a3ac90
2121
- platform: ios
22-
create_revision: 80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819
23-
base_revision: 80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819
22+
create_revision: 077b4a4ce10a07b82caa6897f0c626f9c0a3ac90
23+
base_revision: 077b4a4ce10a07b82caa6897f0c626f9c0a3ac90
2424
- platform: macos
25-
create_revision: 80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819
26-
base_revision: 80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819
25+
create_revision: 077b4a4ce10a07b82caa6897f0c626f9c0a3ac90
26+
base_revision: 077b4a4ce10a07b82caa6897f0c626f9c0a3ac90
2727
- platform: web
28-
create_revision: 80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819
29-
base_revision: 80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819
28+
create_revision: 077b4a4ce10a07b82caa6897f0c626f9c0a3ac90
29+
base_revision: 077b4a4ce10a07b82caa6897f0c626f9c0a3ac90
3030

3131
# User provided section
3232

demo_app/android/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ gradle-wrapper.jar
55
/gradlew.bat
66
/local.properties
77
GeneratedPluginRegistrant.java
8+
.cxx/
89

910
# Remember to never publicly share your keystore.
1011
# See https://flutter.dev/to/reference-keystore

demo_app/android/app/build.gradle renamed to demo_app/android/app/build.gradle.kts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
plugins {
2-
id "com.android.application"
3-
id "kotlin-android"
2+
id("com.android.application")
3+
id("kotlin-android")
44
// The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
5-
id "dev.flutter.flutter-gradle-plugin"
5+
id("dev.flutter.flutter-gradle-plugin")
66
}
77

88
android {
@@ -14,12 +14,12 @@ android {
1414
ndkVersion = "27.0.12077973"
1515

1616
compileOptions {
17-
sourceCompatibility = JavaVersion.VERSION_1_8
18-
targetCompatibility = JavaVersion.VERSION_1_8
17+
sourceCompatibility = JavaVersion.VERSION_11
18+
targetCompatibility = JavaVersion.VERSION_11
1919
}
2020

2121
kotlinOptions {
22-
jvmTarget = JavaVersion.VERSION_1_8
22+
jvmTarget = JavaVersion.VERSION_11.toString()
2323
}
2424

2525
defaultConfig {
@@ -32,8 +32,8 @@ android {
3232
versionName = flutter.versionName
3333

3434
// https://patrol.leancode.co/getting-started
35-
testInstrumentationRunner "pl.leancode.patrol.PatrolJUnitRunner"
36-
testInstrumentationRunnerArguments clearPackageData: "true"
35+
testInstrumentationRunner = "pl.leancode.patrol.PatrolJUnitRunner"
36+
testInstrumentationRunnerArguments["clearPackageData"] = "true"
3737
}
3838

3939
signingConfigs {
@@ -56,7 +56,7 @@ android {
5656

5757
testOptions {
5858
// https://patrol.leancode.co/getting-started
59-
execution "ANDROIDX_TEST_ORCHESTRATOR"
59+
execution = "ANDROIDX_TEST_ORCHESTRATOR"
6060
}
6161
}
6262

demo_app/android/build.gradle

Lines changed: 0 additions & 18 deletions
This file was deleted.

demo_app/android/build.gradle.kts

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
allprojects {
2+
repositories {
3+
google()
4+
mavenCentral()
5+
}
6+
}
7+
8+
val newBuildDir: Directory = rootProject.layout.buildDirectory.dir("../../build").get()
9+
rootProject.layout.buildDirectory.value(newBuildDir)
10+
11+
subprojects {
12+
val newSubprojectBuildDir: Directory = newBuildDir.dir(project.name)
13+
project.layout.buildDirectory.value(newSubprojectBuildDir)
14+
}
15+
subprojects {
16+
project.evaluationDependsOn(":app")
17+
}
18+
19+
tasks.register<Delete>("clean") {
20+
delete(rootProject.layout.buildDirectory)
21+
}

demo_app/android/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
1+
org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
22
android.useAndroidX=true
33
android.enableJetifier=true

demo_app/android/settings.gradle

Lines changed: 0 additions & 25 deletions
This file was deleted.
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
pluginManagement {
2+
val flutterSdkPath = run {
3+
val properties = java.util.Properties()
4+
file("local.properties").inputStream().use { properties.load(it) }
5+
val flutterSdkPath = properties.getProperty("flutter.sdk")
6+
require(flutterSdkPath != null) { "flutter.sdk not set in local.properties" }
7+
flutterSdkPath
8+
}
9+
10+
includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
11+
12+
repositories {
13+
google()
14+
mavenCentral()
15+
gradlePluginPortal()
16+
}
17+
}
18+
19+
plugins {
20+
id("dev.flutter.flutter-plugin-loader") version "1.0.0"
21+
id("com.android.application") version "8.7.3" apply false
22+
id("org.jetbrains.kotlin.android") version "2.1.0" apply false
23+
}
24+
25+
include(":app")

demo_app/ios/Podfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ flutter_ios_podfile_setup
2828

2929
target 'Runner' do
3030
use_frameworks!
31-
use_modular_headers!
3231

3332
flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
3433
target 'RunnerTests' do

demo_app/ios/Podfile.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,13 @@ SPEC CHECKSUMS:
7777
just_audio: 4e391f57b79cad2b0674030a00453ca5ce817eed
7878
package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
7979
path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
80-
patrol: dd82ffedfee3aba87c1d0ed2daad0b77bfb8ee1f
80+
patrol: 51b76cc7c11a2933ee3e72482d930c75b9d4ec73
8181
sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0
8282
url_launcher_ios: 694010445543906933d732453a59da0a173ae33d
8383
video_player_avfoundation: 2cef49524dd1f16c5300b9cd6efd9611ce03639b
84-
wakelock_plus: 04623e3f525556020ebd4034310f20fe7fda8b49
84+
wakelock_plus: e29112ab3ef0b318e58cfa5c32326458be66b556
8585
webview_flutter_wkwebview: 1821ceac936eba6f7984d89a9f3bcb4dea99ebb2
8686

87-
PODFILE CHECKSUM: 4047b237a92efec4e335c96f6d2daf630bacba96
87+
PODFILE CHECKSUM: 4305caec6b40dde0ae97be1573c53de1882a07e5
8888

8989
COCOAPODS: 1.16.2

0 commit comments

Comments
 (0)