From 6b19a22240acd872447fe5765053494741191673 Mon Sep 17 00:00:00 2001 From: viktorp Date: Wed, 20 Nov 2024 11:14:22 +0100 Subject: [PATCH 1/4] Make sure android denepdencies are included in compilation --- ruler-common/build.gradle.kts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ruler-common/build.gradle.kts b/ruler-common/build.gradle.kts index 3c924b1..f215760 100644 --- a/ruler-common/build.gradle.kts +++ b/ruler-common/build.gradle.kts @@ -44,11 +44,11 @@ dependencies { compileOnly(Dependencies.ANDROID_GRADLE_PLUGIN) testRuntimeOnly(Dependencies.ANDROID_GRADLE_PLUGIN) - compileOnly(Dependencies.BUNDLETOOL) - compileOnly(Dependencies.PROTOBUF_CORE) - compileOnly(Dependencies.ANDROID_TOOLS_COMMON) - compileOnly(Dependencies.ANDROID_TOOLS_SDKLIB) - compileOnly(Dependencies.DEXLIB) + implementation(Dependencies.BUNDLETOOL) + implementation(Dependencies.PROTOBUF_CORE) + implementation(Dependencies.ANDROID_TOOLS_COMMON) + implementation(Dependencies.ANDROID_TOOLS_SDKLIB) + implementation(Dependencies.DEXLIB) implementation(project(":ruler-models")) From e5441dd13203bb8f479e7873058a8088bef01f7e Mon Sep 17 00:00:00 2001 From: viktorp Date: Wed, 20 Nov 2024 11:14:36 +0100 Subject: [PATCH 2/4] Bump dependencies --- buildSrc/src/main/kotlin/Dependencies.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index 614ab2d..d82f3f4 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -63,8 +63,8 @@ object Dependencies { const val NEXUS_PUBLISH_GRADLE_PLUGIN = "2.0.0" // https://mvnrepository.com/artifact/io.github.gradle-nexus.publish-plugin/io.github.gradle-nexus.publish-plugin.gradle.plugin const val SHADOW_GRADLE_PLUGIN = "7.1.2" // https://plugins.gradle.org/plugin/com.github.johnrengelman.shadow - const val BUNDLETOOL = "1.15.6" // https://mvnrepository.com/artifact/com.android.tools.build/bundletool - const val PROTOBUF = "3.21.6" // https://mvnrepository.com/artifact/com.google.protobuf/protobuf-java + const val BUNDLETOOL = "1.17.2" // https://mvnrepository.com/artifact/com.android.tools.build/bundletool + const val PROTOBUF = "3.22.3" // https://mvnrepository.com/artifact/com.google.protobuf/protobuf-java const val DEXLIB = "2.5.2" // https://mvnrepository.com/artifact/org.smali/dexlib2 const val ANDROID_TOOLS = "30.0.4" // https://mvnrepository.com/artifact/com.android.tools/common?repo=google From 9bf8eea41d048cb80340deaa302f0a296e9ffd0b Mon Sep 17 00:00:00 2001 From: viktorp Date: Wed, 20 Nov 2024 11:25:00 +0100 Subject: [PATCH 3/4] Fix download size --- .../test/kotlin/com/spotify/ruler/common/apk/ApkParserTest.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruler-common/src/test/kotlin/com/spotify/ruler/common/apk/ApkParserTest.kt b/ruler-common/src/test/kotlin/com/spotify/ruler/common/apk/ApkParserTest.kt index 750aa0b..650847d 100644 --- a/ruler-common/src/test/kotlin/com/spotify/ruler/common/apk/ApkParserTest.kt +++ b/ruler-common/src/test/kotlin/com/spotify/ruler/common/apk/ApkParserTest.kt @@ -38,6 +38,6 @@ class ApkParserTest { val entries = parser.parse(apkFile) val dex = entries.filterIsInstance().single() - assertThat(dex.classes).contains(ApkEntry.Default("Lcom/spotify/ruler/sample/MainActivity;", 154, 154)) + assertThat(dex.classes).contains(ApkEntry.Default("Lcom/spotify/ruler/sample/MainActivity;", 124, 124)) } } From 278094e0c97d1e8ba2a4e482f7a0aeb2012fc86c Mon Sep 17 00:00:00 2001 From: viktorp Date: Wed, 20 Nov 2024 11:48:38 +0100 Subject: [PATCH 4/4] Bump Ruler version to 2.0.0-beta-3 --- README.md | 2 +- buildSrc/src/main/kotlin/Publish.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 750129d..7b59199 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ buildscript { mavenCentral() } dependencies { - classpath("com.spotify.ruler:ruler-gradle-plugin:2.0.0-beta-2") + classpath("com.spotify.ruler:ruler-gradle-plugin:2.0.0-beta-3") } } ``` diff --git a/buildSrc/src/main/kotlin/Publish.kt b/buildSrc/src/main/kotlin/Publish.kt index 63201de..4485b30 100644 --- a/buildSrc/src/main/kotlin/Publish.kt +++ b/buildSrc/src/main/kotlin/Publish.kt @@ -23,7 +23,7 @@ import org.gradle.kotlin.dsl.extra import org.gradle.plugins.signing.SigningExtension const val RULER_PLUGIN_GROUP = "com.spotify.ruler" -const val RULER_PLUGIN_VERSION = "2.0.0-beta-2" // Also adapt this version in the README +const val RULER_PLUGIN_VERSION = "2.0.0-beta-3" // Also adapt this version in the README const val EXT_POM_NAME = "POM_NAME" const val EXT_POM_DESCRIPTION = "POM_DESCRIPTION"