Skip to content

Commit 70e4855

Browse files
committed
Regenerate Android demo app config
1 parent def7733 commit 70e4855

File tree

8 files changed

+35
-23
lines changed

8 files changed

+35
-23
lines changed

example/.metadata

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

66
version:
7-
revision: "3e493a3e4d0a5c99fa7da51faae354e95a9a1abe"
8-
channel: "beta"
7+
revision: "b45fa18946ecc2d9b4009952c636ba7e2ffbb787"
8+
channel: "stable"
99

1010
project_type: app
1111

1212
# Tracks metadata for the flutter migrate command
1313
migration:
1414
platforms:
1515
- platform: root
16-
create_revision: 3e493a3e4d0a5c99fa7da51faae354e95a9a1abe
17-
base_revision: 3e493a3e4d0a5c99fa7da51faae354e95a9a1abe
16+
create_revision: b45fa18946ecc2d9b4009952c636ba7e2ffbb787
17+
base_revision: b45fa18946ecc2d9b4009952c636ba7e2ffbb787
1818
- platform: android
19-
create_revision: 3e493a3e4d0a5c99fa7da51faae354e95a9a1abe
20-
base_revision: 3e493a3e4d0a5c99fa7da51faae354e95a9a1abe
19+
create_revision: b45fa18946ecc2d9b4009952c636ba7e2ffbb787
20+
base_revision: b45fa18946ecc2d9b4009952c636ba7e2ffbb787
21+
- platform: ios
22+
create_revision: b45fa18946ecc2d9b4009952c636ba7e2ffbb787
23+
base_revision: b45fa18946ecc2d9b4009952c636ba7e2ffbb787
24+
- platform: web
25+
create_revision: b45fa18946ecc2d9b4009952c636ba7e2ffbb787
26+
base_revision: b45fa18946ecc2d9b4009952c636ba7e2ffbb787
27+
- platform: windows
28+
create_revision: b45fa18946ecc2d9b4009952c636ba7e2ffbb787
29+
base_revision: b45fa18946ecc2d9b4009952c636ba7e2ffbb787
2130

2231
# User provided section
2332

example/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

example/android/app/build.gradle.kts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,15 @@ plugins {
88
android {
99
namespace = "dev.jaffaketchup.fmtc.demo"
1010
compileSdk = flutter.compileSdkVersion
11-
// ndkVersion = flutter.ndkVersion
12-
ndkVersion = "27.0.12077973"
11+
ndkVersion = flutter.ndkVersion
1312

1413
compileOptions {
15-
sourceCompatibility = JavaVersion.VERSION_1_8
16-
targetCompatibility = JavaVersion.VERSION_1_8
14+
sourceCompatibility = JavaVersion.VERSION_17
15+
targetCompatibility = JavaVersion.VERSION_17
1716
}
1817

1918
kotlinOptions {
20-
jvmTarget = JavaVersion.VERSION_1_8.toString()
19+
jvmTarget = JavaVersion.VERSION_17.toString()
2120
}
2221

2322
defaultConfig {

example/android/build.gradle.kts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@ allprojects {
55
}
66
}
77

8-
val newBuildDir: Directory = rootProject.layout.buildDirectory.dir("../../build").get()
8+
val newBuildDir: Directory =
9+
rootProject.layout.buildDirectory
10+
.dir("../../build")
11+
.get()
912
rootProject.layout.buildDirectory.value(newBuildDir)
1013

1114
subprojects {

example/android/gradle.properties

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

example/android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
33
zipStoreBase=GRADLE_USER_HOME
44
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip
Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
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-
}
2+
val flutterSdkPath =
3+
run {
4+
val properties = java.util.Properties()
5+
file("local.properties").inputStream().use { properties.load(it) }
6+
val flutterSdkPath = properties.getProperty("flutter.sdk")
7+
require(flutterSdkPath != null) { "flutter.sdk not set in local.properties" }
8+
flutterSdkPath
9+
}
910

1011
includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
1112

@@ -18,8 +19,8 @@ pluginManagement {
1819

1920
plugins {
2021
id("dev.flutter.flutter-plugin-loader") version "1.0.0"
21-
id("com.android.application") version "8.7.0" apply false
22-
id("org.jetbrains.kotlin.android") version "1.8.22" apply false
22+
id("com.android.application") version "8.11.1" apply false
23+
id("org.jetbrains.kotlin.android") version "2.2.20" apply false
2324
}
2425

2526
include(":app")

0 commit comments

Comments
 (0)