Android works again
This commit is contained in:
parent
d372523a44
commit
b3531f340c
6 changed files with 40 additions and 20 deletions
25
.metadata
25
.metadata
|
|
@ -4,7 +4,7 @@
|
|||
# This file should be version controlled and should not be manually edited.
|
||||
|
||||
version:
|
||||
revision: "05db9689081f091050f01aed79f04dce0c750154"
|
||||
revision: "67323de285b00232883f53b84095eb72be97d35c"
|
||||
channel: "stable"
|
||||
|
||||
project_type: app
|
||||
|
|
@ -13,11 +13,26 @@ project_type: app
|
|||
migration:
|
||||
platforms:
|
||||
- platform: root
|
||||
create_revision: 05db9689081f091050f01aed79f04dce0c750154
|
||||
base_revision: 05db9689081f091050f01aed79f04dce0c750154
|
||||
create_revision: 67323de285b00232883f53b84095eb72be97d35c
|
||||
base_revision: 67323de285b00232883f53b84095eb72be97d35c
|
||||
- platform: android
|
||||
create_revision: 67323de285b00232883f53b84095eb72be97d35c
|
||||
base_revision: 67323de285b00232883f53b84095eb72be97d35c
|
||||
- platform: ios
|
||||
create_revision: 67323de285b00232883f53b84095eb72be97d35c
|
||||
base_revision: 67323de285b00232883f53b84095eb72be97d35c
|
||||
- platform: linux
|
||||
create_revision: 67323de285b00232883f53b84095eb72be97d35c
|
||||
base_revision: 67323de285b00232883f53b84095eb72be97d35c
|
||||
- platform: macos
|
||||
create_revision: 67323de285b00232883f53b84095eb72be97d35c
|
||||
base_revision: 67323de285b00232883f53b84095eb72be97d35c
|
||||
- platform: web
|
||||
create_revision: 05db9689081f091050f01aed79f04dce0c750154
|
||||
base_revision: 05db9689081f091050f01aed79f04dce0c750154
|
||||
create_revision: 67323de285b00232883f53b84095eb72be97d35c
|
||||
base_revision: 67323de285b00232883f53b84095eb72be97d35c
|
||||
- platform: windows
|
||||
create_revision: 67323de285b00232883f53b84095eb72be97d35c
|
||||
base_revision: 67323de285b00232883f53b84095eb72be97d35c
|
||||
|
||||
# User provided section
|
||||
|
||||
|
|
|
|||
|
|
@ -11,12 +11,12 @@ android {
|
|||
ndkVersion = flutter.ndkVersion
|
||||
|
||||
compileOptions {
|
||||
sourceCompatibility = JavaVersion.VERSION_11
|
||||
targetCompatibility = JavaVersion.VERSION_11
|
||||
sourceCompatibility = JavaVersion.VERSION_17
|
||||
targetCompatibility = JavaVersion.VERSION_17
|
||||
}
|
||||
|
||||
kotlinOptions {
|
||||
jvmTarget = JavaVersion.VERSION_11.toString()
|
||||
jvmTarget = JavaVersion.VERSION_17.toString()
|
||||
}
|
||||
|
||||
defaultConfig {
|
||||
|
|
|
|||
|
|
@ -5,7 +5,10 @@ allprojects {
|
|||
}
|
||||
}
|
||||
|
||||
val newBuildDir: Directory = rootProject.layout.buildDirectory.dir("../../build").get()
|
||||
val newBuildDir: Directory =
|
||||
rootProject.layout.buildDirectory
|
||||
.dir("../../build")
|
||||
.get()
|
||||
rootProject.layout.buildDirectory.value(newBuildDir)
|
||||
|
||||
subprojects {
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
|
||||
android.useAndroidX=true
|
||||
android.enableJetifier=true
|
||||
# https://stackoverflow.com/questions/77520506/inconsistent-jvm-target-compatibility-detected-for-tasks-despite-already-definin
|
||||
kotlin.jvm.target.validation.mode = IGNORE
|
||||
|
|
|
|||
|
|
@ -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-8.12-all.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip
|
||||
|
|
|
|||
|
|
@ -1,11 +1,12 @@
|
|||
pluginManagement {
|
||||
val flutterSdkPath = run {
|
||||
val properties = java.util.Properties()
|
||||
file("local.properties").inputStream().use { properties.load(it) }
|
||||
val flutterSdkPath = properties.getProperty("flutter.sdk")
|
||||
require(flutterSdkPath != null) { "flutter.sdk not set in local.properties" }
|
||||
flutterSdkPath
|
||||
}
|
||||
val flutterSdkPath =
|
||||
run {
|
||||
val properties = java.util.Properties()
|
||||
file("local.properties").inputStream().use { properties.load(it) }
|
||||
val flutterSdkPath = properties.getProperty("flutter.sdk")
|
||||
require(flutterSdkPath != null) { "flutter.sdk not set in local.properties" }
|
||||
flutterSdkPath
|
||||
}
|
||||
|
||||
includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
|
||||
|
||||
|
|
@ -18,8 +19,8 @@ pluginManagement {
|
|||
|
||||
plugins {
|
||||
id("dev.flutter.flutter-plugin-loader") version "1.0.0"
|
||||
id("com.android.application") version "8.7.3" apply false
|
||||
id("org.jetbrains.kotlin.android") version "2.1.0" apply false
|
||||
id("com.android.application") version "8.11.1" apply false
|
||||
id("org.jetbrains.kotlin.android") version "2.2.20" apply false
|
||||
}
|
||||
|
||||
include(":app")
|
||||
|
|
|
|||
Loading…
Reference in a new issue