Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
* Please see the LICENSE included with this distribution for details.
*/

apply from: 'untar.gradle'

buildscript {
ext.kotlin_version = '2.3.0'

Expand All @@ -13,7 +15,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:8.13.2'
classpath 'com.android.tools.build:gradle:9.1.0'
classpath 'com.google.gms:google-services:4.4.4'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'org.codehaus.groovy:groovy-json:3.0.17'
Expand Down
2 changes: 2 additions & 0 deletions android/cli/commands/_build.js
Original file line number Diff line number Diff line change
Expand Up @@ -2228,6 +2228,8 @@ class AndroidBuilder extends Builder {
gradleProperties.push({ key: 'android.nonTransitiveRClass', value: 'false' });
gradleProperties.push({ key: 'org.gradle.jvmargs', value: `-Xmx${this.javacMaxMemory}` });
gradleProperties.push({ key: 'org.gradle.configuration-cache', value: 'true' });
gradleProperties.push({ key: 'android.builtInKotlin', value: 'false' });
gradleProperties.push({ key: 'android.newDsl', value: 'false' });
await gradlew.writeGradlePropertiesFile(gradleProperties);

// Copy optional "gradle.properties" file contents from Titanium project to the above generated file.
Expand Down
2 changes: 2 additions & 0 deletions android/cli/commands/_buildModule.js
Original file line number Diff line number Diff line change
Expand Up @@ -523,6 +523,8 @@ export class AndroidModuleBuilder extends Builder {
gradleProperties.push({ key: 'android.useAndroidX', value: 'true' });
gradleProperties.push({ key: 'android.suppressUnsupportedCompileSdk', value: '35' });
gradleProperties.push({ key: 'android.nonTransitiveRClass', value: 'false' });
gradleProperties.push({ key: 'android.builtInKotlin', value: 'false' });
gradleProperties.push({ key: 'android.newDsl', value: 'false' });
gradleProperties.push({
key: 'org.gradle.jvmargs',
value: `-Xmx${this.javacMaxMemory} -Dkotlin.daemon.jvm.options="-Xmx${this.javacMaxMemory}"`
Expand Down
9 changes: 8 additions & 1 deletion android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,18 @@
# --------------------------------------------------------------------------------

# Set max Java heap size for Gradle daemon process.
org.gradle.jvmargs=-Xmx1536m
org.gradle.jvmargs=-Xmx2g

# Enable parallel build execution
org.gradle.parallel=true

# Enable usage of Google's AndroidX libraries.
# Note: Jetifier is not needed for test app since it doesn't use Google's deprecated support libraries.
android.useAndroidX=true
android.enableJetifier=false
android.nonTransitiveRClass=false
android.suppressUnsupportedCompileSdk=35

# opt-out of build in kotlin (v9 feature) - need to be changed for Gradle 10 (smae in _build/_buildModule)
android.builtInKotlin=false
android.newDsl=false
2 changes: 1 addition & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
4 changes: 2 additions & 2 deletions android/gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion android/templates/build/root.build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:8.13.2'
classpath 'com.android.tools.build:gradle:9.1.0'
classpath 'com.google.gms:google-services:4.4.4'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
<% for (let i = 0; i < classpaths.length; i++) {%>
Expand Down
2 changes: 1 addition & 1 deletion android/titanium/libv8-services.js
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ async function updateLibrary() {
console.log(`Decompressing downloaded V8 file: ${inFile}`);
const untarCommandLine
= quotePath(path.join(__dirname, '..', isWindows ? 'gradlew.bat' : 'gradlew'))
+ ' -b ' + quotePath(path.join(__dirname, '..', 'untar.gradle'))
+ ' -p ' + quotePath(path.join(__dirname, '..'))
+ ' -Pcompression=bzip2'
+ ' -Psrc=' + quotePath(inFile)
+ ' -Pdest=' + quotePath(outDir);
Expand Down
Loading