Skip to content
This repository has been archived by the owner on Dec 13, 2023. It is now read-only.

use version catalog #256

Merged
merged 1 commit into from
Nov 7, 2023
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 build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import org.eclipse.jgit.storage.file.FileRepositoryBuilder
plugins {
alias(libs.plugins.agp.lib) apply false
alias(libs.plugins.agp.app) apply false
alias(lspatch.plugins.kotlin.android) apply false
}

buildscript {
Expand All @@ -17,7 +18,6 @@ buildscript {
}
dependencies {
classpath("org.eclipse.jgit:org.eclipse.jgit:6.3.0.202209071007-r")
classpath(kotlin("gradle-plugin", version = "1.8.21"))
}
}

Expand Down
61 changes: 61 additions & 0 deletions gradle/lspatch.versions.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
[versions]
room = "2.5.2"
accompanist = "0.27.0"
compose-destinations = "1.9.42-beta"
shizuku = "13.1.2"
hiddenapi-refine = "4.3.0"
hiddenapi-stub = "4.2.0"
compose-bom = "2023.06.01"
kotlin = "1.8.21"
ksp = "1.8.21-1.0.11"
commons-io = "2.13.0"
beust-jcommander = "1.82"
google-gson = "2.10.1"

[plugins]
google-devtools-ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
rikka-tools-refine = { id = "dev.rikka.tools.refine", version.ref = "hiddenapi-refine" }
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }

[libraries]
androidx-customview = "androidx.customview:customview:1.2.0-alpha02"
androidx-customview-poolingcontainer = "androidx.customview:customview-poolingcontainer:1.0.0"

androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "compose-bom" }
androidx-compose-ui = { module = "androidx.compose.ui:ui" }
androidx-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling" }
androidx-compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" }
androidx-compose-material-icons-extended = { module = "androidx.compose.material:material-icons-extended" }
androidx-compose-material3 = { module = "androidx.compose.material3:material3" }

androidx-navigation-compose = "androidx.navigation:navigation-compose:2.6.0"

androidx-lifecycle-viewmodel-compose = "androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1"

androidx-activity-compose = "androidx.activity:activity-compose:1.7.2"

androidx-core-ktx = "androidx.core:core-ktx:1.10.1"

androidx-room-ktx = { module = "androidx.room:room-ktx", version.ref = "room" }
androidx-room-runtime = { module = "androidx.room:room-runtime", version.ref = "room" }
androidx-room-compiler = { module = "androidx.room:room-compiler", version.ref = "room" }

google-accompanist-navigation-animation = { module = "com.google.accompanist:accompanist-navigation-animation", version.ref = "accompanist" }
google-accompanist-pager = { module = "com.google.accompanist:accompanist-pager", version.ref = "accompanist" }
google-accompanist-swiperefresh = { module = "com.google.accompanist:accompanist-swiperefresh", version.ref = "accompanist" }

rikka-shizuku-api = { module = "dev.rikka.shizuku:api", version.ref = "shizuku" }
rikka-shizuku-provider = { module = "dev.rikka.shizuku:provider", version.ref = "shizuku" }

rikka-refine = { module = "dev.rikka.tools.refine:runtime", version.ref = "hiddenapi-refine" }

rikka-hidden-stub = { module = "dev.rikka.hidden:stub", version.ref = "hiddenapi-stub" }

raamcosta-compose-destinations = { module = "io.github.raamcosta.compose-destinations:core", version.ref = "compose-destinations" }
raamcosta-compose-destinations-ksp = { module = "io.github.raamcosta.compose-destinations:ksp", version.ref = "compose-destinations" }

commons-io = { module = "commons-io:commons-io", version.ref = "commons-io" }

beust-jcommander = { module = "com.beust:jcommander", version.ref = "beust-jcommander" }

google-gson = { module = "com.google.code.gson:gson", version.ref = "google-gson" }
62 changes: 29 additions & 33 deletions manager/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ val coreVerName: String by rootProject.extra

plugins {
alias(libs.plugins.agp.app)
id("com.google.devtools.ksp")
id("dev.rikka.tools.refine")
alias(lspatch.plugins.google.devtools.ksp)
alias(lspatch.plugins.rikka.tools.refine)
alias(lspatch.plugins.kotlin.android)
id("kotlin-parcelize")
kotlin("android")
}

android {
Expand Down Expand Up @@ -97,39 +97,35 @@ dependencies {
implementation(projects.services.daemonService)
implementation(projects.share.android)
implementation(projects.share.java)

val roomVersion = "2.5.2"
val accompanistVersion = "0.27.0"
val composeDestinationsVersion = "1.9.42-beta"
implementation(platform("androidx.compose:compose-bom:2023.06.01"))

annotationProcessor("androidx.room:room-compiler:$roomVersion")
compileOnly("dev.rikka.hidden:stub:4.2.0")
debugImplementation("androidx.compose.ui:ui-tooling")
debugImplementation("androidx.customview:customview:1.2.0-alpha02")
debugImplementation("androidx.customview:customview-poolingcontainer:1.0.0")
implementation("androidx.activity:activity-compose:1.7.2")
implementation("androidx.compose.material:material-icons-extended")
implementation("androidx.compose.material3:material3")
implementation("androidx.compose.ui:ui")
implementation("androidx.compose.ui:ui-tooling-preview")
implementation("androidx.core:core-ktx:1.10.1")
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1")
implementation("androidx.navigation:navigation-compose:2.6.0")
implementation(platform(lspatch.androidx.compose.bom))

annotationProcessor(lspatch.androidx.room.compiler)
compileOnly(lspatch.rikka.hidden.stub)
debugImplementation(lspatch.androidx.compose.ui.tooling)
debugImplementation(lspatch.androidx.customview)
debugImplementation(lspatch.androidx.customview.poolingcontainer)
implementation(lspatch.androidx.activity.compose)
implementation(lspatch.androidx.compose.material.icons.extended)
implementation(lspatch.androidx.compose.material3)
implementation(lspatch.androidx.compose.ui)
implementation(lspatch.androidx.compose.ui.tooling.preview)
implementation(lspatch.androidx.core.ktx)
implementation(lspatch.androidx.lifecycle.viewmodel.compose)
implementation(lspatch.androidx.navigation.compose)
implementation(libs.androidx.preference)
implementation("androidx.room:room-ktx:$roomVersion")
implementation("androidx.room:room-runtime:$roomVersion")
implementation("com.google.accompanist:accompanist-navigation-animation:$accompanistVersion")
implementation("com.google.accompanist:accompanist-pager:$accompanistVersion")
implementation("com.google.accompanist:accompanist-swiperefresh:$accompanistVersion")
implementation(lspatch.androidx.room.ktx)
implementation(lspatch.androidx.room.runtime)
implementation(lspatch.google.accompanist.navigation.animation)
implementation(lspatch.google.accompanist.pager)
implementation(lspatch.google.accompanist.swiperefresh)
implementation(libs.material)
implementation(libs.gson)
implementation("dev.rikka.shizuku:api:13.1.2")
implementation("dev.rikka.shizuku:provider:13.1.2")
implementation("dev.rikka.tools.refine:runtime:4.3.0")
implementation("io.github.raamcosta.compose-destinations:core:$composeDestinationsVersion")
implementation(lspatch.rikka.shizuku.api)
implementation(lspatch.rikka.shizuku.provider)
implementation(lspatch.rikka.refine)
implementation(lspatch.raamcosta.compose.destinations)
implementation(libs.appiconloader)
implementation(libs.hiddenapibypass)
ksp("androidx.room:room-compiler:$roomVersion")
ksp("io.github.raamcosta.compose-destinations:ksp:$composeDestinationsVersion")
ksp(lspatch.androidx.room.compiler)
ksp(lspatch.raamcosta.compose.destinations.ksp)
}
6 changes: 3 additions & 3 deletions patch/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ dependencies {
implementation(projects.apkzlib)
implementation(projects.share.java)

implementation("commons-io:commons-io:2.13.0")
implementation("com.beust:jcommander:1.82")
implementation("com.google.code.gson:gson:2.10.1")
implementation(lspatch.commons.io)
implementation(lspatch.beust.jcommander)
implementation(lspatch.google.gson)
}
7 changes: 3 additions & 4 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@ pluginManagement {
google()
mavenCentral()
}
plugins {
id("com.google.devtools.ksp") version "1.8.21-1.0.11"
id("dev.rikka.tools.refine") version "4.3.0"
}
}

dependencyResolutionManagement {
Expand All @@ -27,6 +23,9 @@ dependencyResolutionManagement {
create("libs") {
from(files("core/gradle/libs.versions.toml"))
}
create("lspatch") {
from(files("gradle/lspatch.versions.toml"))
}
}
}

Expand Down