Skip to content
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.

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

Change dependencies to impl #174

Merged
merged 4 commits into from
Nov 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
}
```
Expand Down
4 changes: 2 additions & 2 deletions buildSrc/src/main/kotlin/Dependencies.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/Publish.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
10 changes: 5 additions & 5 deletions ruler-common/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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"))

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,6 @@ class ApkParserTest {
val entries = parser.parse(apkFile)
val dex = entries.filterIsInstance<ApkEntry.Dex>().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))
}
}
Loading