Skip to content

Commit 8d7c811

Browse files
authored
Update AGP and gradle (#475)
1 parent a5d95a1 commit 8d7c811

4 files changed

Lines changed: 14 additions & 14 deletions

File tree

android/build.gradle

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ buildscript {
2222
}
2323

2424
dependencies {
25-
classpath('com.android.tools.build:gradle:8.4.1')
25+
classpath('com.android.tools.build:gradle:9.2.1')
2626
}
2727
}
2828

@@ -69,7 +69,7 @@ allprojects {
6969
}
7070

7171
dependencies {
72-
implementation "com.facebook.react:react-android:+"
72+
implementation "com.facebook.react:react-android:0.80.0"
7373
implementation 'com.okta.android:okta-oidc-android:1.3.4'
7474
implementation 'com.squareup.okhttp3:okhttp:4.12.0'
7575
implementation 'com.squareup.okio:okio:3.5.0'
@@ -105,15 +105,6 @@ afterEvaluate { project ->
105105
include '**/*.java'
106106
}
107107

108-
android.libraryVariants.all { variant ->
109-
def name = variant.name.capitalize()
110-
def javaCompileTask = variant.javaCompileProvider.get()
111-
112-
task "jar${name}"(type: Jar, dependsOn: javaCompileTask) {
113-
from javaCompileTask.destinationDir
114-
}
115-
}
116-
117108
artifacts {
118109
archives androidSourcesJar
119110
}
@@ -126,3 +117,13 @@ afterEvaluate { project ->
126117
}
127118
}
128119
}
120+
121+
androidComponents {
122+
onVariants(selector().all()) { variant ->
123+
def name = variant.name.capitalize()
124+
tasks.register("jar${name}", Jar) {
125+
dependsOn("compile${name}JavaWithJavac")
126+
from(tasks.named("compile${name}JavaWithJavac").flatMap { it.destinationDirectory })
127+
}
128+
}
129+
}

android/gradle.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,3 @@ org.gradle.jvmargs=-Xmx2048m
1616
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
1717
# org.gradle.parallel=true
1818
android.useAndroidX=true
19-
android.enableJetifier=true

android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-all.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

e2e/android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.5-all.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)