Skip to content

Commit 3ac8e70

Browse files
committed
Fully move toolchain to Jvm and configure gradle to use up to 8G of ram
- Kotlin now use compilerOptions -> jvmTarget - Gradle properties changed to use 8G of ram and removed kotlin specific limit - Bumped NDK
1 parent e6e13f5 commit 3ac8e70

3 files changed

Lines changed: 17 additions & 5 deletions

File tree

android/app/build.gradle.kts

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
12
import java.util.Properties
23
import java.io.FileInputStream
34

@@ -25,14 +26,23 @@ android {
2526
//compileSdkVersion flutter.compileSdkVersion
2627
//ndkVersion = flutter.ndkVersion
2728
compileSdk = 36
28-
ndkVersion = "29.0.13599879"
29+
ndkVersion = "29.0.14206865 "
30+
31+
val compileJavaVersion = JavaVersion.VERSION_17
32+
val kotlinJvmTarget = JvmTarget.JVM_17
2933

3034
compileOptions {
3135
// Flag to enable support for the new language APIs
3236
isCoreLibraryDesugaringEnabled = true
3337
// Sets Java compatibility to Java 17
34-
sourceCompatibility = JavaVersion.VERSION_17
35-
targetCompatibility = JavaVersion.VERSION_17
38+
sourceCompatibility = compileJavaVersion
39+
targetCompatibility = compileJavaVersion
40+
}
41+
42+
kotlin {
43+
compilerOptions {
44+
jvmTarget = kotlinJvmTarget
45+
}
3646
}
3747

3848
defaultConfig {

android/build.gradle.kts

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

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

1113
subprojects {

android/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@
1414
android.nonFinalResIds=false
1515
android.nonTransitiveRClass=false
1616
android.useAndroidX=true
17-
org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M"
17+
org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError

0 commit comments

Comments
 (0)