Skip to content

Commit b162aca

Browse files
alexej520alexej520
committed
Up AGP to 9.0.0
1 parent 3249adf commit b162aca

8 files changed

Lines changed: 28 additions & 27 deletions

File tree

‎gradle/libs.versions.toml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
[versions]
2-
agp = "8.13.0"
3-
apache-ant = "1.10.14"
4-
asm-commons = "9.6"
5-
android-tools = "31.1.4"
6-
kotlin = "2.0.0"
7-
shadow = "8.3.0"
2+
agp = "9.0.0"
3+
apache-ant = "1.10.15"
4+
asm-commons = "9.9.1"
5+
android-tools = "32.0.0"
6+
kotlin = "2.3.0"
7+
shadow = "9.3.1"
88
publisher = "0.18.0"
9-
kotlinx-metadata = "0.9.0"
9+
kotlin-metadata = "2.3.0"
1010

1111
[libraries]
1212
apache-ant = { module = "org.apache.ant:ant", version.ref = "apache-ant" }
@@ -16,7 +16,7 @@ gradle-android-sdk-common = { module = "com.android.tools:sdk-common", version.r
1616
gradle-android-layoutlib = { module = "com.android.tools.layoutlib:layoutlib-api", version.ref = "android-tools" }
1717
gradle-android-build = { module = "com.android.tools.build:gradle", version.ref = "agp" }
1818
gradle-shadow = { module = "com.gradleup.shadow:shadow-gradle-plugin", version.ref = "shadow" }
19-
kotlinx-metadata-jvm = { module = "org.jetbrains.kotlinx:kotlinx-metadata-jvm", version.ref = "kotlinx-metadata" }
19+
kotlinx-metadata-jvm = { module = "org.jetbrains.kotlin:kotlin-metadata-jvm", version.ref = "kotlin-metadata" }
2020

2121
[bundles]
2222
gradle-android = ["gradle-android-sdk-common", "gradle-android-build", "gradle-android-common", "gradle-android-layoutlib"]

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

‎grease/src/main/kotlin/io/deepmedia/tools/grease/GreaseExtension.kt‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,18 @@ package io.deepmedia.tools.grease
22

33
import com.github.jengelman.gradle.plugins.shadow.relocation.Relocator
44
import com.github.jengelman.gradle.plugins.shadow.relocation.SimpleRelocator
5-
import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer
5+
import com.github.jengelman.gradle.plugins.shadow.transformers.ResourceTransformer
66
import org.gradle.api.Action
77
import org.gradle.api.model.ObjectFactory
88
import org.gradle.kotlin.dsl.listProperty
9-
import org.gradle.kotlin.dsl.newInstance
109
import org.gradle.kotlin.dsl.property
1110
import javax.inject.Inject
1211

1312
abstract class GreaseExtension @Inject constructor(objects: ObjectFactory) {
1413

1514
internal val prefix = objects.property<String>().convention("")
1615
internal val relocators = objects.listProperty<Relocator>()
17-
internal val transformers = objects.listProperty<Transformer>()
16+
internal val transformers = objects.listProperty<ResourceTransformer>()
1817

1918
fun relocate(prefix: String = "grease") {
2019
this.prefix.set(prefix)
@@ -26,7 +25,7 @@ abstract class GreaseExtension @Inject constructor(objects: ObjectFactory) {
2625
relocators.add(relocator)
2726
}
2827

29-
fun <T : Transformer> transform(transformer: T, configure: Action<T> = Action { }) {
28+
fun <T : ResourceTransformer> transform(transformer: T, configure: Action<T> = Action { }) {
3029
configure.execute(transformer)
3130
transformers.add(transformer)
3231
}

‎grease/src/main/kotlin/io/deepmedia/tools/grease/GreasePlugin.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package io.deepmedia.tools.grease
22

33
import com.android.build.api.component.analytics.AnalyticsEnabledVariant
4+
import com.android.build.api.dsl.LibraryExtension
45
import com.android.build.api.variant.AndroidComponentsExtension
56
import com.android.build.api.variant.Variant
67
import com.android.build.api.variant.impl.getApiString
7-
import com.android.build.gradle.LibraryExtension
88
import com.android.build.gradle.internal.LibraryTaskManager
99
import com.android.build.gradle.internal.LoggerWrapper
1010
import com.android.build.gradle.internal.TaskManager
@@ -406,7 +406,7 @@ open class GreasePlugin : Plugin<Project> {
406406
val jarExtractWorkdir = workdir.dir("extract").dir("jar")
407407
val jarFileName = "classes.jar"
408408

409-
val bundleLibraryTask = creationConfig.taskContainer.bundleLibraryTask
409+
val bundleLibraryTask = creationConfig.taskContainer.bundleLibraryTask!!
410410

411411
val greaseExpandTask = target.tasks.locateOrRegisterTask(
412412
creationConfig.resolveTaskName("extract", "Aar").greasify(),
@@ -506,7 +506,7 @@ open class GreasePlugin : Plugin<Project> {
506506
}
507507
}
508508

509-
greaseExtension.relocators.get().forEach<Relocator?>(::relocate)
509+
greaseExtension.relocators.get().forEach(::relocate)
510510
greaseExtension.transformers.get().forEach(::transform)
511511
transform(KotlinModuleShadowTransformer(logger.child("kotlin_module")))
512512
}
@@ -522,7 +522,7 @@ open class GreasePlugin : Plugin<Project> {
522522
replacePackagesInFile(
523523
aarExtractWorkdir.file("AndroidManifest.xml").asFile,
524524
greaseShadowDir.file("AndroidManifest.xml").asFile,
525-
relocators,
525+
relocators.get().toList(),
526526
target,
527527
)
528528

‎grease/src/main/kotlin/io/deepmedia/tools/grease/KotlinModuleShadowTransformer.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
package io.deepmedia.tools.grease
22

33
import com.github.jengelman.gradle.plugins.shadow.transformers.CacheableTransformer
4-
import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer
4+
import com.github.jengelman.gradle.plugins.shadow.transformers.ResourceTransformer
55
import com.github.jengelman.gradle.plugins.shadow.transformers.TransformerContext
66
import org.gradle.api.file.FileTreeElement
7-
import kotlinx.metadata.jvm.KotlinModuleMetadata
8-
import kotlinx.metadata.jvm.UnstableMetadataApi
7+
import kotlin.metadata.jvm.KotlinModuleMetadata
8+
import kotlin.metadata.jvm.UnstableMetadataApi
99
import org.apache.tools.zip.ZipEntry
1010
import org.apache.tools.zip.ZipOutputStream
1111

1212
// from kotlin sources
1313

1414
@CacheableTransformer
1515
@OptIn(UnstableMetadataApi::class)
16-
internal class KotlinModuleShadowTransformer(private val logger: Logger) : Transformer {
16+
internal class KotlinModuleShadowTransformer(private val logger: Logger) : ResourceTransformer {
1717
@Suppress("ArrayInDataClass")
1818
private data class Entry(val path: String, val bytes: ByteArray)
1919

@@ -31,7 +31,7 @@ internal class KotlinModuleShadowTransformer(private val logger: Logger) : Trans
3131
.fold(content) { acc, relocator -> relocator.applyToSourceContent(acc) }
3232

3333
logger.i { "Transforming kotlin_module ${context.path}" }
34-
val metadata = KotlinModuleMetadata.read(context.`is`.readBytes())
34+
val metadata = KotlinModuleMetadata.read(context.inputStream.readBytes())
3535
val module = metadata.kmModule
3636

3737
val packageParts = module.packageParts.toMap()

‎grease/src/main/kotlin/io/deepmedia/tools/grease/RClassRelocator.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ internal class RClassRelocator(
1919
include( "%regex[$fromRPathRegex]")
2020
}
2121

22-
override fun canRelocateClass(className: String?): Boolean = false
22+
override fun canRelocateClass(className: String): Boolean = false
2323

2424
override fun relocatePath(context: RelocatePathContext): String {
2525
val foundedPath = fromRPathRegex.find(context.path)?.value

‎grease/src/main/kotlin/io/deepmedia/tools/grease/configurations.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package io.deepmedia.tools.grease
22

33
import com.android.build.api.attributes.BuildTypeAttr
4+
import com.android.build.api.dsl.LibraryBuildType
45
import com.android.build.api.variant.AndroidComponentsExtension
56
import com.android.build.api.variant.Variant
6-
import com.android.build.gradle.internal.dsl.BuildType
77
import com.android.build.gradle.internal.publishing.AndroidArtifacts
88
import org.gradle.api.NamedDomainObjectContainer
99
import org.gradle.api.Project
@@ -132,7 +132,7 @@ internal fun Project.createProductFlavorConfigurations(
132132
// Create one configuration per build type.
133133
// Make it extend the root configuration so that artifacts are inherited.
134134
internal fun Project.createBuildTypeConfigurations(
135-
buildTypes: NamedDomainObjectContainer<out BuildType>,
135+
buildTypes: NamedDomainObjectContainer<out LibraryBuildType>,
136136
isTransitive: Boolean,
137137
log: Logger
138138
) {

‎grease/src/main/kotlin/io/deepmedia/tools/grease/merge.kt‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import com.android.ide.common.resources.MergedResourceWriter
77
import com.android.ide.common.resources.MergedResourceWriterRequest
88
import com.android.ide.common.resources.ResourceCompilationService
99
import com.android.ide.common.resources.ResourceMerger
10+
import com.android.ide.common.resources.ResourcePathEncoding
1011
import com.android.ide.common.resources.ResourceSet
1112
import com.android.ide.common.workers.WorkerExecutorFacade
1213
import org.gradle.api.logging.Logger
@@ -20,7 +21,8 @@ internal fun mergeResourcesWithCompilationService(
2021
minSdk: Int,
2122
aaptWorkerFacade: WorkerExecutorFacade,
2223
blameLogOutputFolder: File,
23-
logger: Logger) {
24+
logger: Logger
25+
) {
2426
val mergedResourcesDir = mergedResources.also {
2527
it.mkdirs()
2628
}
@@ -47,7 +49,7 @@ internal fun mergeResourcesWithCompilationService(
4749
notCompiledOutputDirectory = null,
4850
pseudoLocalesEnabled = false,
4951
crunchPng = false,
50-
moduleSourceSets = emptyMap()
52+
relativePathEncoding = ResourcePathEncoding.AbsoluteNotRelocatable
5153
)
5254
val writer = MergedResourceWriter(mergeResourcesWriterRequest)
5355
resourceMerger.mergeData(writer, true)

0 commit comments

Comments
 (0)