Skip to content

Commit 13bcfcd

Browse files
committed
update build.gradle
1 parent dd800da commit 13bcfcd

2 files changed

Lines changed: 1 addition & 58 deletions

File tree

android/build.gradle

Lines changed: 0 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@ buildscript {
33
google()
44
mavenCentral()
55
}
6-
dependencies {
7-
classpath "com.android.tools.build:gradle:8.5.2"
8-
classpath "com.google.protobuf:protobuf-gradle-plugin:0.9.4"
9-
}
106
}
117

128
ext {
@@ -33,24 +29,6 @@ allprojects {
3329
mavenCentral()
3430
maven { url 'https://jitpack.io' }
3531
}
36-
37-
// This code fixes a 'namespace not specified' error upgrading AGP to >= 8.x.x.
38-
subprojects { subproject ->
39-
subproject.tasks.whenTaskAdded {
40-
if (it.name.contains("kapt")) {
41-
it.enabled = false
42-
}
43-
}
44-
afterEvaluate { project ->
45-
if (project.hasProperty('android')) {
46-
project.android {
47-
if (namespace == null) {
48-
namespace project.group
49-
}
50-
}
51-
}
52-
}
53-
}
5432
}
5533

5634
rootProject.buildDir = '../build'
@@ -61,41 +39,6 @@ subprojects {
6139
project.evaluationDependsOn(':app')
6240
}
6341

64-
// Workaround for AGP 8.6+ defaultProguardFile ordering with R8
65-
subprojects { sp ->
66-
if (sp.path != ':app') {
67-
sp.afterEvaluate {
68-
tasks.matching { t -> t.name.startsWith('minify') && t.name.endsWith('WithR8') }
69-
.configureEach {
70-
dependsOn(':app:extractProguardFiles')
71-
mustRunAfter(':app:extractProguardFiles')
72-
}
73-
}
74-
}
75-
}
76-
77-
subprojects { p ->
78-
afterEvaluate {
79-
if (p.hasProperty("android")) {
80-
p.android {
81-
compileOptions {
82-
sourceCompatibility JavaVersion.VERSION_17
83-
targetCompatibility JavaVersion.VERSION_17
84-
}
85-
}
86-
}
87-
88-
p.tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
89-
kotlinOptions { jvmTarget = "17" }
90-
}
91-
92-
p.tasks.withType(JavaCompile).configureEach {
93-
sourceCompatibility = JavaVersion.VERSION_17
94-
targetCompatibility = JavaVersion.VERSION_17
95-
}
96-
}
97-
}
98-
9942
tasks.register("clean", Delete) {
10043
delete rootProject.buildDir
10144
}

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-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)