Skip to content

Commit 28c31b0

Browse files
fankesfankes
committed
chore: migrate to version catalog, Gropify
1 parent 1ac51ac commit 28c31b0

File tree

9 files changed

+183
-213
lines changed

9 files changed

+183
-213
lines changed

‎build.gradle.kts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
22
import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
33

44
plugins {
5-
autowire(libs.plugins.android.application) apply false
6-
autowire(libs.plugins.android.library) apply false
7-
autowire(libs.plugins.kotlin.jvm) apply false
8-
autowire(libs.plugins.kotlin.android) apply false
9-
autowire(libs.plugins.kotlin.ksp) apply false
5+
alias(libs.plugins.android.application) apply false
6+
alias(libs.plugins.android.library) apply false
7+
alias(libs.plugins.kotlin.jvm) apply false
8+
alias(libs.plugins.kotlin.android) apply false
9+
alias(libs.plugins.kotlin.ksp) apply false
1010
}
1111

1212
allprojects {

‎gradle/libs.versions.toml‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
[versions]
2+
agp = "8.13.1"
3+
kotlin = "2.2.21"
4+
ksp = "2.2.21-2.0.4"
5+
maven-publish = "0.35.0"
6+
rovo89-xposed-api = "82"
7+
hiddenapibypass = "6.1"
8+
auto-service-annotations = "1.1.1"
9+
auto-service-ksp = "1.2.0"
10+
kavaref-core = "1.0.2"
11+
kavaref-extension = "1.0.1"
12+
hikage-core = "1.0.2"
13+
hikage-compiler = "1.0.1"
14+
hikage-extension = "1.0.1"
15+
hikage-widget-androidx = "1.0.1"
16+
hikage-widget-material = "1.0.1"
17+
betterandroid-ui-component = "1.0.8"
18+
betterandroid-ui-extension = "1.0.7"
19+
betterandroid-system-extension = "1.0.3"
20+
androidx-annotation = "1.9.1"
21+
androidx-preference-ktx = "1.2.1"
22+
androidx-core-ktx = "1.17.0"
23+
androidx-appcompat = "1.7.1"
24+
androidx-lifecycle-viewmodel-ktx = "2.9.4"
25+
# noinspection GradleDependency
26+
material = "1.11.0"
27+
androidx-constraintlayout = "2.2.1"
28+
junit = "4.13.2"
29+
androidx-test-ext-junit = "1.3.0"
30+
androidx-test-espresso-core = "3.7.0"
31+
32+
[plugins]
33+
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
34+
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
35+
kotlin-ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
36+
android-application = { id = "com.android.application", version.ref = "agp" }
37+
android-library = { id = "com.android.library", version.ref = "agp" }
38+
maven-publish = { id = "com.vanniktech.maven.publish", version.ref = "maven-publish" }
39+
40+
[libraries]
41+
rovo89-xposed-api = { module = "de.robv.android.xposed:api", version.ref = "rovo89-xposed-api" }
42+
hiddenapibypass = { module = "org.lsposed.hiddenapibypass:hiddenapibypass", version.ref = "hiddenapibypass" }
43+
symbol-processing-api = { module = "com.google.devtools.ksp:symbol-processing-api", version.ref = "ksp" }
44+
auto-service-annotations = { module = "com.google.auto.service:auto-service-annotations", version.ref = "auto-service-annotations" }
45+
auto-service-ksp = { module = "dev.zacsweers.autoservice:auto-service-ksp", version.ref = "auto-service-ksp" }
46+
kavaref-core = { module = "com.highcapable.kavaref:kavaref-core", version.ref = "kavaref-core" }
47+
kavaref-extension = { module = "com.highcapable.kavaref:kavaref-extension", version.ref = "kavaref-extension" }
48+
hikage-core = { module = "com.highcapable.hikage:hikage-core", version.ref = "hikage-core" }
49+
hikage-compiler = { module = "com.highcapable.hikage:hikage-compiler", version.ref = "hikage-compiler" }
50+
hikage-extension = { module = "com.highcapable.hikage:hikage-extension", version.ref = "hikage-extension" }
51+
hikage-widget-androidx = { module = "com.highcapable.hikage:hikage-widget-androidx", version.ref = "hikage-widget-androidx" }
52+
hikage-widget-material = { module = "com.highcapable.hikage:hikage-widget-material", version.ref = "hikage-widget-material" }
53+
betterandroid-ui-component = { module = "com.highcapable.betterandroid:ui-component", version.ref = "betterandroid-ui-component" }
54+
betterandroid-ui-extension = { module = "com.highcapable.betterandroid:ui-extension", version.ref = "betterandroid-ui-extension" }
55+
betterandroid-system-extension = { module = "com.highcapable.betterandroid:system-extension", version.ref = "betterandroid-system-extension" }
56+
androidx-annotation = { module = "androidx.annotation:annotation", version.ref = "androidx-annotation" }
57+
androidx-preference-ktx = { module = "androidx.preference:preference-ktx", version.ref = "androidx-preference-ktx" }
58+
androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "androidx-core-ktx" }
59+
androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" }
60+
androidx-lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle-viewmodel-ktx" }
61+
material = { module = "com.google.android.material:material", version.ref = "material" }
62+
androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "androidx-constraintlayout" }
63+
junit = { module = "junit:junit", version.ref = "junit" }
64+
androidx-test-ext-junit = { module = "androidx.test.ext:junit", version.ref = "androidx-test-ext-junit" }
65+
androidx-test-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "androidx-test-espresso-core" }

‎gradle/sweet-dependency/sweet-dependency-config.yaml‎

Lines changed: 0 additions & 110 deletions
This file was deleted.

‎samples/demo-app/build.gradle.kts‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
plugins {
2-
autowire(libs.plugins.android.application)
3-
autowire(libs.plugins.kotlin.android)
4-
autowire(libs.plugins.kotlin.ksp)
2+
alias(libs.plugins.android.application)
3+
alias(libs.plugins.kotlin.android)
4+
alias(libs.plugins.kotlin.ksp)
55
}
66

77
android {
8-
namespace = property.project.samples.demo.app.packageName
9-
compileSdk = property.project.android.compileSdk
8+
namespace = gropify.project.samples.demo.app.packageName
9+
compileSdk = gropify.project.android.compileSdk
1010

1111
defaultConfig {
12-
applicationId = property.project.samples.demo.app.packageName
13-
minSdk = property.project.android.minSdk
14-
targetSdk = property.project.android.targetSdk
15-
versionName = property.project.samples.demo.app.versionName
16-
versionCode = property.project.samples.demo.app.versionCode
12+
applicationId = gropify.project.samples.demo.app.packageName
13+
minSdk = gropify.project.android.minSdk
14+
targetSdk = gropify.project.android.targetSdk
15+
versionName = gropify.project.samples.demo.app.versionName
16+
versionCode = gropify.project.samples.demo.app.versionCode
1717
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
1818
}
1919
buildTypes {
@@ -34,20 +34,20 @@ android {
3434
}
3535

3636
dependencies {
37-
ksp(com.highcapable.hikage.hikage.compiler)
38-
implementation(com.highcapable.hikage.hikage.core)
39-
implementation(com.highcapable.hikage.hikage.extension)
40-
implementation(com.highcapable.hikage.hikage.widget.androidx)
41-
implementation(com.highcapable.hikage.hikage.widget.material)
42-
implementation(com.highcapable.betterandroid.ui.component)
43-
implementation(com.highcapable.betterandroid.ui.extension)
44-
implementation(com.highcapable.betterandroid.system.extension)
45-
implementation(androidx.core.core.ktx)
46-
implementation(androidx.appcompat.appcompat)
47-
implementation(androidx.lifecycle.lifecycle.viewmodel.ktx)
48-
implementation(com.google.android.material.material)
49-
implementation(androidx.constraintlayout.constraintlayout)
50-
testImplementation(junit.junit)
51-
androidTestImplementation(androidx.test.ext.junit)
52-
androidTestImplementation(androidx.test.espresso.espresso.core)
37+
ksp(libs.hikage.compiler)
38+
implementation(libs.hikage.core)
39+
implementation(libs.hikage.extension)
40+
implementation(libs.hikage.widget.androidx)
41+
implementation(libs.hikage.widget.material)
42+
implementation(libs.betterandroid.ui.component)
43+
implementation(libs.betterandroid.ui.extension)
44+
implementation(libs.betterandroid.system.extension)
45+
implementation(libs.androidx.core.ktx)
46+
implementation(libs.androidx.appcompat)
47+
implementation(libs.androidx.lifecycle.viewmodel.ktx)
48+
implementation(libs.material)
49+
implementation(libs.androidx.constraintlayout)
50+
testImplementation(libs.junit)
51+
androidTestImplementation(libs.androidx.test.ext.junit)
52+
androidTestImplementation(libs.androidx.test.espresso.core)
5353
}

‎samples/demo-module/build.gradle.kts‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
plugins {
2-
autowire(libs.plugins.android.application)
3-
autowire(libs.plugins.kotlin.android)
4-
autowire(libs.plugins.kotlin.ksp)
2+
alias(libs.plugins.android.application)
3+
alias(libs.plugins.kotlin.android)
4+
alias(libs.plugins.kotlin.ksp)
55
}
66

77
android {
8-
namespace = property.project.samples.demo.module.packageName
9-
compileSdk = property.project.android.compileSdk
8+
namespace = gropify.project.samples.demo.module.packageName
9+
compileSdk = gropify.project.android.compileSdk
1010

1111
defaultConfig {
12-
applicationId = property.project.samples.demo.module.packageName
13-
minSdk = property.project.android.minSdk
14-
targetSdk = property.project.android.targetSdk
15-
versionName = property.project.samples.demo.module.versionName
16-
versionCode = property.project.samples.demo.module.versionCode
12+
applicationId = gropify.project.samples.demo.module.packageName
13+
minSdk = gropify.project.android.minSdk
14+
targetSdk = gropify.project.android.targetSdk
15+
versionName = gropify.project.samples.demo.module.versionName
16+
versionCode = gropify.project.samples.demo.module.versionCode
1717
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
1818
}
1919
buildTypes {
@@ -35,26 +35,26 @@ android {
3535
}
3636

3737
dependencies {
38-
compileOnly(de.robv.android.xposed.api)
38+
compileOnly(libs.rovo89.xposed.api)
3939
implementation(projects.yukihookapiCore)
4040
ksp(projects.yukihookapiKspXposed)
41-
ksp(com.highcapable.hikage.hikage.compiler)
42-
implementation(com.highcapable.kavaref.kavaref.core)
43-
implementation(com.highcapable.kavaref.kavaref.extension)
44-
implementation(com.highcapable.hikage.hikage.core)
45-
implementation(com.highcapable.hikage.hikage.extension)
46-
implementation(com.highcapable.hikage.hikage.widget.androidx)
47-
implementation(com.highcapable.hikage.hikage.widget.material)
48-
implementation(com.highcapable.betterandroid.ui.component)
49-
implementation(com.highcapable.betterandroid.ui.extension)
50-
implementation(com.highcapable.betterandroid.system.extension)
51-
implementation(androidx.preference.preference.ktx)
52-
implementation(androidx.core.core.ktx)
53-
implementation(androidx.appcompat.appcompat)
54-
implementation(androidx.lifecycle.lifecycle.viewmodel.ktx)
55-
implementation(com.google.android.material.material)
56-
implementation(androidx.constraintlayout.constraintlayout)
57-
testImplementation(junit.junit)
58-
androidTestImplementation(androidx.test.ext.junit)
59-
androidTestImplementation(androidx.test.espresso.espresso.core)
41+
ksp(libs.hikage.compiler)
42+
implementation(libs.kavaref.core)
43+
implementation(libs.kavaref.extension)
44+
implementation(libs.hikage.core)
45+
implementation(libs.hikage.extension)
46+
implementation(libs.hikage.widget.androidx)
47+
implementation(libs.hikage.widget.material)
48+
implementation(libs.betterandroid.ui.component)
49+
implementation(libs.betterandroid.ui.extension)
50+
implementation(libs.betterandroid.system.extension)
51+
implementation(libs.androidx.preference.ktx)
52+
implementation(libs.androidx.core.ktx)
53+
implementation(libs.androidx.appcompat)
54+
implementation(libs.androidx.lifecycle.viewmodel.ktx)
55+
implementation(libs.material)
56+
implementation(libs.androidx.constraintlayout)
57+
testImplementation(libs.junit)
58+
androidTestImplementation(libs.androidx.test.ext.junit)
59+
androidTestImplementation(libs.androidx.test.espresso.core)
6060
}

‎settings.gradle.kts‎

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,36 @@ pluginManagement {
66
mavenCentral()
77
}
88
}
9+
dependencyResolutionManagement {
10+
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
11+
repositories {
12+
google()
13+
mavenCentral()
14+
maven("https://jitpack.io")
15+
maven("https://api.xposed.info/") {
16+
content {
17+
includeGroup("de.robv.android.xposed")
18+
}
19+
}
20+
}
21+
}
922
plugins {
10-
id("com.highcapable.sweetdependency") version "1.0.4"
11-
id("com.highcapable.sweetproperty") version "1.0.8"
23+
id("com.highcapable.gropify") version "1.0.0"
1224
}
13-
sweetProperty {
25+
gropify {
1426
global {
15-
sourcesCode {
27+
android {
1628
includeKeys("^project\\..*\$".toRegex())
17-
isEnableRestrictedAccess = true
29+
isRestrictedAccessEnabled = true
1830
}
1931
}
20-
rootProject { all { isEnable = false } }
21-
project(":samples") { all { isEnable = false } }
22-
project(":samples:demo-app", ":samples:demo-module", ":yukihookapi-stub") { sourcesCode { isEnable = false } }
23-
project(":yukihookapi-core", ":yukihookapi-ksp-xposed") { sourcesCode { className = rootProject.name } }
32+
rootProject { common { isEnabled = false } }
33+
projects(":samples") { common { isEnabled = false } }
34+
projects(":samples:demo-app", ":samples:demo-module", ":yukihookapi-stub") { android { isEnabled = false } }
35+
projects(":yukihookapi-core", ":yukihookapi-ksp-xposed") {
36+
android { className = rootProject.name }
37+
jvm { className = rootProject.name }
38+
}
2439
}
2540
rootProject.name = "YukiHookAPI"
2641
include(":samples:demo-app", ":samples:demo-module")

0 commit comments

Comments
 (0)