Skip to content

Update Yoga Android build to Gradle 9, AGP 8.12, SDK 36 #1914

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
NickGerleman wants to merge 1 commit into from
+14 −24
Closed

Update Yoga Android build to Gradle 9, AGP 8.12, SDK 36 #1914

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
*/

plugins {
id("com.android.library") version "8.7.1" apply false
id("com.android.application") version "8.7.1" apply false
id("io.github.gradle-nexus.publish-plugin") version "1.3.0"
id("com.android.library") version "8.12.0" apply false
id("com.android.application") version "8.12.0" apply false
id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
id 'org.jetbrains.kotlin.android' version '2.1.20' apply false
}

Expand Down Expand Up @@ -42,5 +42,5 @@ nexusPublishing {
}

task clean(type: Delete) {
delete rootProject.buildDir
delete rootProject.layout.buildDirectory
}
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@

android.useAndroidX=true

org.gradle.jvmargs=-Xmx1536M
org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=1g -Dfile.encoding=UTF-8

VERSION_NAME=0.0.0
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
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.13-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
6 changes: 1 addition & 5 deletions java/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,7 @@
LICENSE file in the root directory of this source tree.
-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.facebook.yoga"
android:versionCode="1"
android:versionName="1.0"
>
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<application/>

Expand Down
20 changes: 7 additions & 13 deletions java/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,10 @@ plugins {

group = "com.facebook.yoga"

val compileSdkVersionProperty: Int by rootProject.extra
val minSdkVersionProperty: Int by rootProject.extra
val targetSdkVersionProperty: Int by rootProject.extra
val buildToolsVersionProperty: String by rootProject.extra
val ndkVersionProperty: String by rootProject.extra

android {
namespace = "com.facebook.yoga"
compileSdk = 35
buildToolsVersion = "35.0.0"
compileSdk = 36
buildToolsVersion = "36.0.0"
ndkVersion = "27.1.12297006"

defaultConfig {
Expand All @@ -37,8 +31,8 @@ android {
externalNativeBuild { cmake { path("CMakeLists.txt") } }

compileOptions {
targetCompatibility(JavaVersion.VERSION_1_8)
sourceCompatibility(JavaVersion.VERSION_1_8)
targetCompatibility(JavaVersion.VERSION_17)
sourceCompatibility(JavaVersion.VERSION_17)
}

sourceSets {
Expand All @@ -49,7 +43,7 @@ android {
}
}

kotlinOptions { jvmTarget = "1.8" }
kotlinOptions { jvmTarget = "17" }

publishing {
multipleVariants {
Expand All @@ -62,9 +56,9 @@ android {

dependencies {
implementation("com.google.code.findbugs:jsr305:3.0.2")
implementation("com.facebook.soloader:soloader:0.10.5")
implementation("com.facebook.soloader:soloader:0.12.1")
implementation("androidx.core:core-ktx:1.16.0")
testImplementation("junit:junit:4.12")
testImplementation("junit:junit:4.13.2")
}

version =
Expand Down
Loading