Skip to content

Commit 17c9a08

Browse files
fankesfankes
committed
chore: migrate to version catalog, Gropify
1 parent 6a8661a commit 17c9a08

6 files changed

Lines changed: 100 additions & 137 deletions

File tree

‎.idea/inspectionProfiles/Project_Default.xml‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/build.gradle.kts‎

Lines changed: 33 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
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.app.packageName
9-
compileSdk = property.project.android.compileSdk
8+
namespace = gropify.project.app.packageName
9+
compileSdk = gropify.project.android.compileSdk
1010

1111
signingConfigs {
1212
create("universal") {
13-
keyAlias = property.project.app.signing.keyAlias
14-
keyPassword = property.project.app.signing.keyPassword
15-
storeFile = rootProject.file(property.project.app.signing.storeFilePath)
16-
storePassword = property.project.app.signing.storePassword
13+
keyAlias = gropify.project.app.signing.keyAlias
14+
keyPassword = gropify.project.app.signing.keyPassword
15+
storeFile = rootProject.file(gropify.project.app.signing.storeFilePath)
16+
storePassword = gropify.project.app.signing.storePassword
1717
enableV1Signing = true
1818
enableV2Signing = true
1919
}
2020
}
2121
defaultConfig {
22-
applicationId = property.project.app.packageName
23-
minSdk = property.project.android.minSdk
24-
targetSdk = property.project.android.targetSdk
25-
versionName = property.project.app.versionName
26-
versionCode = property.project.app.versionCode
22+
applicationId = gropify.project.app.packageName
23+
minSdk = gropify.project.android.minSdk
24+
targetSdk = gropify.project.android.targetSdk
25+
versionName = gropify.project.app.versionName
26+
versionCode = gropify.project.app.versionCode
2727
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
2828
}
2929
buildTypes {
@@ -50,40 +50,31 @@ androidComponents {
5050
onVariants(selector().all()) {
5151
it.outputs.forEach { output ->
5252
val currentType = it.buildType
53-
54-
// Workaround for GitHub Actions.
55-
// Why? I don't know, but it works.
56-
// Unresolved reference. None of the following candidates is applicable because of receiver type mismatch:
57-
// public inline fun CharSequence.isNotBlank(): Boolean defined in kotlin.text.
58-
@Suppress("UNNECESSARY_SAFE_CALL", "RemoveRedundantCallsOfConversionMethods")
59-
val currentSuffix = property.github.ci.commit.id?.let { suffix ->
60-
// Workaround for GitHub Actions.
61-
// Strongly transfer type to [String].
62-
val sSuffix = suffix.toString()
63-
if (sSuffix.isNotBlank()) "-$sSuffix" else ""
53+
val currentSuffix = gropify.github.ci.commit.id.let { suffix ->
54+
if (suffix.isNotBlank()) "-$suffix" else ""
6455
}
6556
val currentVersion = "${output.versionName.get()}$currentSuffix(${output.versionCode.get()})"
6657
if (output is com.android.build.api.variant.impl.VariantOutputImpl)
67-
output.outputFileName.set("${property.project.name}-v$currentVersion-$currentType.apk")
58+
output.outputFileName.set("${gropify.project.name}-v$currentVersion-$currentType.apk")
6859
}
6960
}
7061
}
7162

7263
dependencies {
73-
compileOnly(de.robv.android.xposed.api)
74-
implementation(com.highcapable.yukihookapi.api)
75-
ksp(com.highcapable.yukihookapi.ksp.xposed)
76-
implementation(com.highcapable.kavaref.kavaref.core)
77-
implementation(com.highcapable.kavaref.kavaref.extension)
78-
implementation(com.fankes.projectpromote.project.promote)
79-
implementation(com.github.topjohnwu.libsu.core)
80-
implementation(com.github.duanhong169.drawabletoolbox)
81-
implementation(com.squareup.okhttp3.okhttp)
82-
implementation(androidx.core.core.ktx)
83-
implementation(androidx.appcompat.appcompat)
84-
implementation(com.google.android.material.material)
85-
implementation(androidx.constraintlayout.constraintlayout)
86-
testImplementation(junit.junit)
87-
androidTestImplementation(androidx.test.ext.junit)
88-
androidTestImplementation(androidx.test.espresso.espresso.core)
64+
compileOnly(libs.rovo89.xposed.api)
65+
implementation(libs.yukihookapi)
66+
ksp(libs.yukihookapi.ksp.xposed)
67+
implementation(libs.kavaref.core)
68+
implementation(libs.kavaref.extension)
69+
implementation(libs.project.promote)
70+
implementation(libs.libsu)
71+
implementation(libs.drawabletoolbox)
72+
implementation(libs.okhttp)
73+
implementation(libs.androidx.core.ktx)
74+
implementation(libs.androidx.appcompat)
75+
implementation(libs.material)
76+
implementation(libs.androidx.constraintlayout)
77+
testImplementation(libs.junit)
78+
androidTestImplementation(libs.androidx.test.ext.junit)
79+
androidTestImplementation(libs.androidx.test.espresso.core)
8980
}

‎build.gradle.kts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ 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.kotlin.android) apply false
7-
autowire(libs.plugins.kotlin.ksp) apply false
5+
alias(libs.plugins.android.application) apply false
6+
alias(libs.plugins.kotlin.android) apply false
7+
alias(libs.plugins.kotlin.ksp) apply false
88
}
99

1010
allprojects {

‎gradle/libs.versions.toml‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
[versions]
2+
agp = "8.13.1"
3+
kotlin = "2.2.21"
4+
ksp = "2.2.21-2.0.4"
5+
project-promote = "1.0.1"
6+
rovo89-xposed-api = "82"
7+
yukihookapi = "1.3.1"
8+
kavaref-core = "1.0.2"
9+
kavaref-extension = "1.0.1"
10+
libsu = "5.2.2"
11+
drawabletoolbox = "1.0.7"
12+
okhttp = "5.3.0"
13+
androidx-core-ktx = "1.17.0"
14+
androidx-appcompat = "1.7.1"
15+
material = "1.13.0"
16+
androidx-constraintlayout = "2.2.1"
17+
junit = "4.13.2"
18+
androidx-test-junit = "1.3.0"
19+
androidx-test-espresso-core = "3.7.0"
20+
21+
[plugins]
22+
android-application = { id = "com.android.application", version.ref = "agp" }
23+
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
24+
kotlin-ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
25+
26+
[libraries]
27+
project-promote = { group = "com.fankes.projectpromote", name = "project-promote", version.ref = "project-promote" }
28+
rovo89-xposed-api = { group = "de.robv.android.xposed", name = "api", version.ref = "rovo89-xposed-api" }
29+
yukihookapi = { group = "com.highcapable.yukihookapi", name = "api", version.ref = "yukihookapi" }
30+
yukihookapi-ksp-xposed = { group = "com.highcapable.yukihookapi", name = "ksp-xposed", version.ref = "yukihookapi" }
31+
kavaref-core = { group = "com.highcapable.kavaref", name = "kavaref-core", version.ref = "kavaref-core" }
32+
kavaref-extension = { group = "com.highcapable.kavaref", name = "kavaref-extension", version.ref = "kavaref-extension" }
33+
libsu = { group = "com.github.topjohnwu.libsu", name = "core", version.ref = "libsu" }
34+
drawabletoolbox = { group = "com.github.duanhong169", name = "drawabletoolbox", version.ref = "drawabletoolbox" }
35+
okhttp = { group = "com.squareup.okhttp3", name = "okhttp", version.ref = "okhttp" }
36+
androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "androidx-core-ktx" }
37+
androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "androidx-appcompat" }
38+
material = { group = "com.google.android.material", name = "material", version.ref = "material" }
39+
androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "androidx-constraintlayout" }
40+
junit = { group = "junit", name = "junit", version.ref = "junit" }
41+
androidx-test-ext-junit = { group = "androidx.test.ext", name = "junit", version.ref = "androidx-test-junit" }
42+
androidx-test-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "androidx-test-espresso-core" }

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

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

‎settings.gradle.kts‎

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,36 @@ pluginManagement {
55
mavenCentral()
66
}
77
}
8+
dependencyResolutionManagement {
9+
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
10+
repositories {
11+
google()
12+
mavenCentral()
13+
maven("https://jitpack.io")
14+
maven("https://api.xposed.info/")
15+
maven("https://raw.githubusercontent.com/fankes/maven-repository/main/repository/releases")
16+
}
17+
}
818
plugins {
9-
id("com.highcapable.sweetdependency") version "1.0.4"
10-
id("com.highcapable.sweetproperty") version "1.0.8"
19+
id("com.highcapable.gropify") version "1.0.0"
1120
}
12-
sweetProperty {
21+
gropify {
1322
global {
14-
all {
23+
common {
24+
includeKeys(
25+
"GITHUB_CI_COMMIT_ID",
26+
"^project\\..*\$".toRegex()
27+
)
1528
permanentKeyValues("GITHUB_CI_COMMIT_ID" to "")
16-
generateFrom(ROOT_PROJECT, SYSTEM_ENV)
29+
locations(GropifyLocation.RootProject, GropifyLocation.SystemEnv)
1730
}
18-
sourcesCode {
31+
android {
1932
includeKeys("GITHUB_CI_COMMIT_ID")
2033
// 关闭类型自动转换功能，防止一些特殊 "COMMIT ID" 被生成为数值
21-
isEnableTypeAutoConversion = false
34+
useTypeAutoConversion = false
2235
}
2336
}
24-
rootProject { all { isEnable = false } }
37+
rootProject { common { isEnabled = false } }
2538
}
2639
rootProject.name = "ColorOSNotifyIcon"
2740
include(":app")

0 commit comments

Comments
 (0)