chore: migrate to version catalog, Gropify

This commit is contained in:
2025-11-12 17:05:00 +08:00
parent 793a21a32b
commit ab79d9284a
7 changed files with 108 additions and 122 deletions

View File

@@ -1,5 +1,6 @@
<component name="InspectionProjectProfileManager">
<profile version="1.0">
<option name="myName" value="Project Default" />
<inspection_tool class="UnstableApiUsage" enabled="false" level="WARNING" enabled_by_default="false" />
</profile>
</component>

View File

@@ -5,11 +5,11 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
plugins {
autowire(libs.plugins.android.application) apply false
autowire(libs.plugins.android.library) apply false
autowire(libs.plugins.kotlin.android) apply false
autowire(libs.plugins.kotlin.dokka) apply false
autowire(libs.plugins.maven.publish) apply false
alias(libs.plugins.android.application) apply false
alias(libs.plugins.android.library) apply false
alias(libs.plugins.kotlin.android) apply false
alias(libs.plugins.kotlin.dokka) apply false
alias(libs.plugins.maven.publish) apply false
}
libraryProjects {

View File

@@ -1,18 +1,18 @@
plugins {
autowire(libs.plugins.android.application)
autowire(libs.plugins.kotlin.android)
alias(libs.plugins.android.application)
alias(libs.plugins.kotlin.android)
}
android {
namespace = property.project.app.packageName
compileSdk = property.project.android.compileSdk
namespace = gropify.project.app.packageName
compileSdk = gropify.project.android.compileSdk
defaultConfig {
applicationId = property.project.app.packageName
minSdk = property.project.android.minSdk
targetSdk = property.project.android.targetSdk
versionName = property.project.app.versionName
versionCode = property.project.app.versionCode
applicationId = gropify.project.app.packageName
minSdk = gropify.project.android.minSdk
targetSdk = gropify.project.android.targetSdk
versionName = gropify.project.app.versionName
versionCode = gropify.project.app.versionCode
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
buildTypes {
@@ -35,16 +35,16 @@ android {
dependencies {
implementation(projects.pangutextAndroid)
implementation(com.highcapable.betterandroid.ui.component)
implementation(com.highcapable.betterandroid.ui.component.adapter)
implementation(com.highcapable.betterandroid.ui.extension)
implementation(com.highcapable.betterandroid.system.extension)
implementation(androidx.core.core.ktx)
implementation(androidx.appcompat.appcompat)
implementation(com.google.android.material.material)
implementation(androidx.constraintlayout.constraintlayout)
implementation(libs.betterandroid.ui.component)
implementation(libs.betterandroid.ui.component.adapter)
implementation(libs.betterandroid.ui.extension)
implementation(libs.betterandroid.system.extension)
implementation(libs.androidx.core.ktx)
implementation(libs.androidx.appcompat)
implementation(libs.material)
implementation(libs.androidx.constraintlayout)
testImplementation(junit.junit)
androidTestImplementation(androidx.test.ext.junit)
androidTestImplementation(androidx.test.espresso.espresso.core)
testImplementation(libs.junit)
androidTestImplementation(libs.androidx.test.ext.junit)
androidTestImplementation(libs.androidx.test.espresso.core)
}

42
gradle/libs.versions.toml Normal file
View File

@@ -0,0 +1,42 @@
[versions]
agp = "8.13.1"
kotlin = "2.2.21"
# noinspection NewerVersionAvailable
dokka = "1.9.20"
maven-publish = "0.35.0"
betterandroid-ui-component = "1.0.8"
betterandroid-ui-component-adapter = "1.0.0"
betterandroid-ui-extension = "1.0.7"
betterandroid-system-extension = "1.0.3"
kavaref-core = "1.0.2"
kavaref-extension = "1.0.1"
androidx-core = "1.17.0"
androidx-appcompat = "1.7.1"
# noinspection GradleDependency
material = "1.11.0"
androidx-constraintlayout = "2.2.1"
junit = "4.13.2"
androidx-test-ext-junit = "1.3.0"
androidx-test-espresso-core = "3.7.0"
[plugins]
android-application = { id = "com.android.application", version.ref = "agp" }
android-library = { id = "com.android.library", version.ref = "agp" }
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
kotlin-dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
maven-publish = { id = "com.vanniktech.maven.publish", version.ref = "maven-publish" }
[libraries]
betterandroid-ui-component = { module = "com.highcapable.betterandroid:ui-component", version.ref = "betterandroid-ui-component" }
betterandroid-ui-component-adapter = { module = "com.highcapable.betterandroid:ui-component-adapter", version.ref = "betterandroid-ui-component-adapter" }
betterandroid-ui-extension = { module = "com.highcapable.betterandroid:ui-extension", version.ref = "betterandroid-ui-extension" }
betterandroid-system-extension = { module = "com.highcapable.betterandroid:system-extension", version.ref = "betterandroid-system-extension" }
kavaref-core = { module = "com.highcapable.kavaref:kavaref-core", version.ref = "kavaref-core" }
kavaref-extension = { module = "com.highcapable.kavaref:kavaref-extension", version.ref = "kavaref-extension" }
androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "androidx-core" }
androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" }
material = { module = "com.google.android.material:material", version.ref = "material" }
androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "androidx-constraintlayout" }
junit = { module = "junit:junit", version.ref = "junit" }
androidx-test-ext-junit = { module = "androidx.test.ext:junit", version.ref = "androidx-test-ext-junit" }
androidx-test-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "androidx-test-espresso-core" }

View File

@@ -1,70 +0,0 @@
preferences:
autowire-on-sync-mode: UPDATE_OPTIONAL_DEPENDENCIES
repositories-mode: FAIL_ON_PROJECT_REPOS
repositories:
gradle-plugin-portal:
scope: PLUGINS
google:
maven-central:
highcapable-maven-releases:
url: https://raw.githubusercontent.com/HighCapable/maven-repository/main/repository/releases
plugins:
com.android.application:
alias: android-application
version: 8.13.0
com.android.library:
alias: android-library
version-ref: com.android.application
org.jetbrains.kotlin.android:
alias: kotlin-android
version: 2.2.20
org.jetbrains.dokka:
alias: kotlin-dokka
version: 1.9.20
auto-update: false
com.vanniktech.maven.publish:
alias: maven-publish
version: 0.34.0
libraries:
com.highcapable.betterandroid:
ui-component:
version: 1.0.8
ui-component-adapter:
version: 1.0.0
ui-extension:
version: 1.0.7
system-extension:
version: 1.0.3
com.highcapable.kavaref:
kavaref-core:
version: 1.0.2
kavaref-extension:
version: 1.0.1
androidx.core:
core:
version: 1.17.0
core-ktx:
version-ref: <this>::core
androidx.appcompat:
appcompat:
version: 1.7.1
com.google.android.material:
material:
# Workaround for a bug in version 1.12.0
version: 1.11.0
auto-update: false
androidx.constraintlayout:
constraintlayout:
version: 2.2.1
junit:
junit:
version: 4.13.2
androidx.test.ext:
junit:
version: 1.3.0
androidx.test.espresso:
espresso-core:
version: 3.7.0

View File

@@ -1,19 +1,19 @@
plugins {
autowire(libs.plugins.android.library)
autowire(libs.plugins.kotlin.android)
autowire(libs.plugins.kotlin.dokka)
autowire(libs.plugins.maven.publish)
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.kotlin.dokka)
alias(libs.plugins.maven.publish)
}
group = property.project.groupName
version = property.project.pangutext.android.version
group = gropify.project.groupName
version = gropify.project.pangutext.android.version
android {
namespace = property.project.pangutext.android.namespace
compileSdk = property.project.android.compileSdk
namespace = gropify.project.pangutext.android.namespace
compileSdk = gropify.project.android.compileSdk
defaultConfig {
minSdk = property.project.android.minSdk
minSdk = gropify.project.android.minSdk
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro")
}
@@ -30,14 +30,14 @@ android {
}
dependencies {
implementation(com.highcapable.kavaref.kavaref.core)
implementation(com.highcapable.kavaref.kavaref.extension)
implementation(com.highcapable.betterandroid.ui.extension)
implementation(com.highcapable.betterandroid.system.extension)
implementation(androidx.core.core.ktx)
implementation(androidx.appcompat.appcompat)
implementation(libs.kavaref.core)
implementation(libs.kavaref.extension)
implementation(libs.betterandroid.ui.extension)
implementation(libs.betterandroid.system.extension)
implementation(libs.androidx.core.ktx)
implementation(libs.androidx.appcompat)
testImplementation(junit.junit)
androidTestImplementation(androidx.test.ext.junit)
androidTestImplementation(androidx.test.espresso.espresso.core)
testImplementation(libs.junit)
androidTestImplementation(libs.androidx.test.ext.junit)
androidTestImplementation(libs.androidx.test.espresso.core)
}

View File

@@ -8,21 +8,34 @@ pluginManagement {
}
}
plugins {
id("com.highcapable.sweetdependency") version "1.0.4"
id("com.highcapable.sweetproperty") version "1.0.8"
dependencyResolutionManagement {
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
repositories {
google()
mavenCentral()
maven("https://raw.githubusercontent.com/HighCapable/maven-repository/main/repository/releases")
}
}
sweetProperty {
plugins {
id("com.highcapable.gropify") version "1.0.0"
}
gropify {
rootProject {
all {
isEnable = false
common {
isEnabled = false
}
}
project(":pangutext-android") {
sourcesCode {
isEnableRestrictedAccess = true
projects(":pangutext-android") {
android {
isRestrictedAccessEnabled = true
}
}
projects(":demo-android") {
android {
isEnabled = false
}
}
}