diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml index 8d66637..506d1e2 100644 --- a/.idea/inspectionProfiles/Project_Default.xml +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -1,5 +1,6 @@ \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index b923d49..1c69fc7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,14 +6,14 @@ 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.jvm) apply false - autowire(libs.plugins.kotlin.ksp) apply false - autowire(libs.plugins.compose.compiler) 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.jvm) apply false + alias(libs.plugins.kotlin.ksp) apply false + alias(libs.plugins.compose.compiler) apply false + alias(libs.plugins.kotlin.dokka) apply false + alias(libs.plugins.maven.publish) apply false } libraryProjects { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000..ab2f589 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,85 @@ +[versions] +# noinspection NewerVersionAvailable, GradleDependency +kotlin = "2.0.10" +# noinspection GradleDependency +ksp = "2.0.10-1.0.24" +auto-service-annotations = "1.1.1" +auto-service-ksp = "1.2.0" +agp = "8.13.1" +# noinspection NewerVersionAvailable +dokka = "1.9.20" +maven-publish = "0.35.0" +kotlinpoet = "2.2.0" +# noinspection GradleDependency +material = "1.11.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" +hiddenapibypass = "6.1" +kavaref-core = "1.0.2" +kavaref-extension = "1.0.1" +pangutext-android = "1.0.4" +androidx-core = "1.17.0" +androidx-appcompat = "1.7.1" +androidx-constraintlayout = "2.2.1" +androidx-coordinatorlayout = "1.3.0" +androidx-swiperefreshlayout = "1.1.0" +androidx-slidingpanelayout = "1.2.0" +androidx-drawerlayout = "1.2.0" +androidx-cardview = "1.0.0" +androidx-viewpager = "1.1.0" +androidx-viewpager2 = "1.1.0" +androidx-recyclerview = "1.4.0" +androidx-compose-ui = "1.9.4" +junit = "4.13.2" +androidx-test-ext-junit = "1.3.0" +androidx-test-espresso-core = "3.7.0" +# noinspection GradleDependency +android-lint = "31.9.0" + +[plugins] +kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } +kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } +kotlin-ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } +android-application = { id = "com.android.application", version.ref = "agp" } +android-library = { id = "com.android.library", version.ref = "agp" } +compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } +kotlin-dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" } +maven-publish = { id = "com.vanniktech.maven.publish", version.ref = "maven-publish" } + +[libraries] +kotlin-stdlib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib", version.ref = "kotlin" } +ksp-symbol-processing-api = { group = "com.google.devtools.ksp", name = "symbol-processing-api", version.ref = "ksp" } +auto-service-annotations = { group = "com.google.auto.service", name = "auto-service-annotations", version.ref = "auto-service-annotations" } +auto-service-ksp = { group = "dev.zacsweers.autoservice", name = "auto-service-ksp", version.ref = "auto-service-ksp" } +kotlinpoet = { group = "com.squareup", name = "kotlinpoet", version.ref = "kotlinpoet" } +kotlinpoet-ksp = { group = "com.squareup", name = "kotlinpoet-ksp", version.ref = "kotlinpoet" } +betterandroid-ui-component = { group = "com.highcapable.betterandroid", name = "ui-component", version.ref = "betterandroid-ui-component" } +betterandroid-ui-component-adapter = { group = "com.highcapable.betterandroid", name = "ui-component-adapter", version.ref = "betterandroid-ui-component-adapter" } +betterandroid-ui-extension = { group = "com.highcapable.betterandroid", name = "ui-extension", version.ref = "betterandroid-ui-extension" } +betterandroid-system-extension = { group = "com.highcapable.betterandroid", name = "system-extension", version.ref = "betterandroid-system-extension" } +hiddenapibypass = { group = "org.lsposed.hiddenapibypass", name = "hiddenapibypass", version.ref = "hiddenapibypass" } +kavaref-core = { group = "com.highcapable.kavaref", name = "kavaref-core", version.ref = "kavaref-core" } +kavaref-extension = { group = "com.highcapable.kavaref", name = "kavaref-extension", version.ref = "kavaref-extension" } +pangutext-android = { group = "com.highcapable.pangutext", name = "pangutext-android", version.ref = "pangutext-android" } +androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "androidx-core" } +androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "androidx-appcompat" } +material = { group = "com.google.android.material", name = "material", version.ref = "material" } +androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "androidx-constraintlayout" } +androidx-coordinatorlayout = { group = "androidx.coordinatorlayout", name = "coordinatorlayout", version.ref = "androidx-coordinatorlayout" } +androidx-swiperefreshlayout = { group = "androidx.swiperefreshlayout", name = "swiperefreshlayout", version.ref = "androidx-swiperefreshlayout" } +androidx-slidingpanelayout = { group = "androidx.slidingpanelayout", name = "slidingpanelayout", version.ref = "androidx-slidingpanelayout" } +androidx-drawerlayout = { group = "androidx.drawerlayout", name = "drawerlayout", version.ref = "androidx-drawerlayout" } +androidx-cardview = { group = "androidx.cardview", name = "cardview", version.ref = "androidx-cardview" } +androidx-viewpager = { group = "androidx.viewpager", name = "viewpager", version.ref = "androidx-viewpager" } +androidx-viewpager2 = { group = "androidx.viewpager2", name = "viewpager2", version.ref = "androidx-viewpager2" } +androidx-recyclerview = { group = "androidx.recyclerview", name = "recyclerview", version.ref = "androidx-recyclerview" } +androidx-compose-ui = { group = "androidx.compose.ui", name = "ui", version.ref = "androidx-compose-ui" } +junit = { group = "junit", name = "junit", version.ref = "junit" } +androidx-test-ext-junit = { group = "androidx.test.ext", name = "junit", version.ref = "androidx-test-ext-junit" } +androidx-test-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "androidx-test-espresso-core" } +android-lint = { group = "com.android.tools.lint", name = "lint", version.ref = "android-lint" } +android-lint-api = { group = "com.android.tools.lint", name = "lint-api", version.ref = "android-lint" } +android-lint-checks = { group = "com.android.tools.lint", name = "lint-checks", version.ref = "android-lint" } +android-lint-tests = { group = "com.android.tools.lint", name = "lint-tests", version.ref = "android-lint" } \ No newline at end of file diff --git a/gradle/sweet-dependency/sweet-dependency-config.yaml b/gradle/sweet-dependency/sweet-dependency-config.yaml deleted file mode 100644 index 13ac637..0000000 --- a/gradle/sweet-dependency/sweet-dependency-config.yaml +++ /dev/null @@ -1,141 +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: - org.jetbrains.kotlin.jvm: - alias: kotlin-jvm - version: 2.0.10 - auto-update: false - org.jetbrains.kotlin.android: - alias: kotlin-android - version-ref: kotlin-jvm - com.google.devtools.ksp: - alias: kotlin-ksp - version: 2.0.10-1.0.24 - auto-update: false - com.android.application: - alias: android-application - version: 8.13.0 - com.android.library: - alias: android-library - version-ref: android-application - org.jetbrains.kotlin.plugin.compose: - alias: compose-compiler - version-ref: kotlin-jvm - 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: - org.jetbrains.kotlin: - kotlin-stdlib: - version-ref: ::kotlin-jvm - com.google.devtools.ksp: - symbol-processing-api: - version-ref: ::kotlin-ksp - com.google.auto.service: - auto-service-annotations: - version: 1.1.1 - dev.zacsweers.autoservice: - auto-service-ksp: - version: 1.2.0 - com.squareup: - kotlinpoet: - version: 2.2.0 - kotlinpoet-ksp: - version-ref: ::kotlinpoet - 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 - org.lsposed.hiddenapibypass: - hiddenapibypass: - version: 6.1 - com.highcapable.kavaref: - kavaref-core: - version: 1.0.2 - kavaref-extension: - version: 1.0.1 - com.highcapable.pangutext: - pangutext-android: - version: 1.0.4 - androidx.core: - core: - version: 1.17.0 - core-ktx: - version-ref: ::core - androidx.appcompat: - appcompat: - version: 1.7.1 - com.google.android.material: - material: - auto-update: false - # Workaround for a bug in version 1.12.0 - version: 1.11.0 - androidx.constraintlayout: - constraintlayout: - version: 2.2.1 - androidx.coordinatorlayout: - coordinatorlayout: - version: 1.3.0 - androidx.swiperefreshlayout: - swiperefreshlayout: - version: 1.1.0 - androidx.slidingpanelayout: - slidingpanelayout: - version: 1.2.0 - androidx.drawerlayout: - drawerlayout: - version: 1.2.0 - androidx.cardview: - cardview: - version: 1.0.0 - androidx.viewpager: - viewpager: - version: 1.1.0 - androidx.viewpager2: - viewpager2: - version: 1.1.0 - androidx.recyclerview: - recyclerview: - version: 1.4.0 - androidx.compose.ui: - ui: - version: 1.9.1 - junit: - junit: - version: 4.13.2 - androidx.test.ext: - junit: - version: 1.3.0 - androidx.test.espresso: - espresso-core: - version: 3.7.0 - com.android.tools.lint: - lint: - version: 31.9.0 - auto-update: false - lint-api: - version-ref: ::lint - lint-checks: - version-ref: ::lint - lint-tests: - version-ref: ::lint \ No newline at end of file diff --git a/hikage-compiler/build.gradle.kts b/hikage-compiler/build.gradle.kts index c8953d3..316fc32 100644 --- a/hikage-compiler/build.gradle.kts +++ b/hikage-compiler/build.gradle.kts @@ -1,11 +1,11 @@ plugins { - autowire(libs.plugins.kotlin.jvm) - autowire(libs.plugins.kotlin.ksp) - autowire(libs.plugins.maven.publish) + alias(libs.plugins.kotlin.jvm) + alias(libs.plugins.kotlin.ksp) + alias(libs.plugins.maven.publish) } -group = property.project.groupName -version = property.project.hikage.compiler.version +group = gropify.project.groupName +version = gropify.project.hikage.compiler.version java { sourceCompatibility = JavaVersion.VERSION_17 @@ -24,11 +24,11 @@ kotlin { } dependencies { - compileOnly(com.google.devtools.ksp.symbol.processing.api) + compileOnly(libs.ksp.symbol.processing.api) - ksp(dev.zacsweers.autoservice.auto.service.ksp) + ksp(libs.auto.service.ksp) - implementation(com.google.auto.service.auto.service.annotations) - implementation(com.squareup.kotlinpoet) - implementation(com.squareup.kotlinpoet.ksp) + implementation(libs.auto.service.annotations) + implementation(libs.kotlinpoet) + implementation(libs.kotlinpoet.ksp) } \ No newline at end of file diff --git a/hikage-core-lint/build.gradle.kts b/hikage-core-lint/build.gradle.kts index dbe9512..7dedf56 100644 --- a/hikage-core-lint/build.gradle.kts +++ b/hikage-core-lint/build.gradle.kts @@ -2,10 +2,10 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - autowire(libs.plugins.kotlin.jvm) + alias(libs.plugins.kotlin.jvm) } -group = property.project.groupName +group = gropify.project.groupName java { sourceCompatibility = JavaVersion.VERSION_17 @@ -32,16 +32,16 @@ tasks.withType().configureEach { tasks.named("jar") { manifest { attributes( - "Lint-Registry-V2" to property.project.hikage.core.lint.registry.v2.clazz + "Lint-Registry-V2" to gropify.project.hikage.core.lint.registry.v2.clazz ) } } dependencies { - compileOnly(org.jetbrains.kotlin.kotlin.stdlib) - compileOnly(com.android.tools.lint.lint.api) - compileOnly(com.android.tools.lint.lint.checks) + compileOnly(libs.kotlin.stdlib) + compileOnly(libs.android.lint.api) + compileOnly(libs.android.lint.checks) - testImplementation(com.android.tools.lint.lint) - testImplementation(com.android.tools.lint.lint.tests) + testImplementation(libs.android.lint) + testImplementation(libs.android.lint.tests) } \ No newline at end of file diff --git a/hikage-core/build.gradle.kts b/hikage-core/build.gradle.kts index 57be9ad..3aefbf4 100644 --- a/hikage-core/build.gradle.kts +++ b/hikage-core/build.gradle.kts @@ -1,20 +1,20 @@ plugins { - autowire(libs.plugins.android.library) - autowire(libs.plugins.kotlin.android) - autowire(libs.plugins.kotlin.dokka) - autowire(libs.plugins.maven.publish) - autowire(libs.plugins.kotlin.ksp) + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) + alias(libs.plugins.kotlin.dokka) + alias(libs.plugins.maven.publish) + alias(libs.plugins.kotlin.ksp) } -group = property.project.groupName -version = property.project.hikage.core.version +group = gropify.project.groupName +version = gropify.project.hikage.core.version android { - namespace = property.project.hikage.core.namespace - compileSdk = property.project.android.compileSdk + namespace = gropify.project.hikage.core.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") } @@ -35,16 +35,16 @@ dependencies { ksp(projects.hikageCompiler) - api(com.highcapable.betterandroid.ui.extension) + api(libs.betterandroid.ui.extension) - implementation(org.lsposed.hiddenapibypass.hiddenapibypass) - implementation(com.highcapable.kavaref.kavaref.core) - implementation(com.highcapable.kavaref.kavaref.extension) - implementation(com.highcapable.betterandroid.system.extension) - implementation(androidx.core.core.ktx) - implementation(androidx.appcompat.appcompat) + implementation(libs.hiddenapibypass) + implementation(libs.kavaref.core) + implementation(libs.kavaref.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) } \ No newline at end of file diff --git a/hikage-extension-betterandroid/build.gradle.kts b/hikage-extension-betterandroid/build.gradle.kts index 072acbe..aca21af 100644 --- a/hikage-extension-betterandroid/build.gradle.kts +++ b/hikage-extension-betterandroid/build.gradle.kts @@ -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.hikage.extension.version +group = gropify.project.groupName +version = gropify.project.hikage.extension.version android { - namespace = property.project.hikage.extension.betterandroid.namespace - compileSdk = property.project.android.compileSdk + namespace = gropify.project.hikage.extension.betterandroid.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") } @@ -32,16 +32,16 @@ android { dependencies { implementation(projects.hikageCore) - implementation(com.highcapable.kavaref.kavaref.core) - implementation(com.highcapable.kavaref.kavaref.extension) - 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(libs.kavaref.core) + implementation(libs.kavaref.extension) + 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) - 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) } \ No newline at end of file diff --git a/hikage-extension-compose/build.gradle.kts b/hikage-extension-compose/build.gradle.kts index 3e21c96..d2d7609 100644 --- a/hikage-extension-compose/build.gradle.kts +++ b/hikage-extension-compose/build.gradle.kts @@ -1,20 +1,20 @@ plugins { - autowire(libs.plugins.android.library) - autowire(libs.plugins.kotlin.android) - autowire(libs.plugins.compose.compiler) - autowire(libs.plugins.kotlin.dokka) - autowire(libs.plugins.maven.publish) + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) + alias(libs.plugins.compose.compiler) + alias(libs.plugins.kotlin.dokka) + alias(libs.plugins.maven.publish) } -group = property.project.groupName -version = property.project.hikage.extension.compose.version +group = gropify.project.groupName +version = gropify.project.hikage.extension.compose.version android { - namespace = property.project.hikage.extension.compose.namespace - compileSdk = property.project.android.compileSdk + namespace = gropify.project.hikage.extension.compose.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") } @@ -33,15 +33,15 @@ android { dependencies { implementation(projects.hikageCore) - 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(androidx.compose.ui.ui) + 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) + implementation(libs.androidx.compose.ui) - 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) } \ No newline at end of file diff --git a/hikage-extension/build.gradle.kts b/hikage-extension/build.gradle.kts index bb24cbe..7edd6b4 100644 --- a/hikage-extension/build.gradle.kts +++ b/hikage-extension/build.gradle.kts @@ -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.hikage.extension.version +group = gropify.project.groupName +version = gropify.project.hikage.extension.version android { - namespace = property.project.hikage.extension.namespace - compileSdk = property.project.android.compileSdk + namespace = gropify.project.hikage.extension.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") } @@ -32,15 +32,15 @@ android { dependencies { implementation(projects.hikageCore) - 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(androidx.constraintlayout.constraintlayout) + 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) + 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) } \ No newline at end of file diff --git a/hikage-widget-androidx/build.gradle.kts b/hikage-widget-androidx/build.gradle.kts index e889513..fd7c07b 100644 --- a/hikage-widget-androidx/build.gradle.kts +++ b/hikage-widget-androidx/build.gradle.kts @@ -1,19 +1,19 @@ plugins { - autowire(libs.plugins.android.library) - autowire(libs.plugins.kotlin.android) - autowire(libs.plugins.maven.publish) - autowire(libs.plugins.kotlin.ksp) + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) + alias(libs.plugins.maven.publish) + alias(libs.plugins.kotlin.ksp) } -group = property.project.groupName -version = property.project.hikage.widget.androidx.version +group = gropify.project.groupName +version = gropify.project.hikage.widget.androidx.version android { - namespace = property.project.hikage.widget.androidx.namespace - compileSdk = property.project.android.compileSdk + namespace = gropify.project.hikage.widget.androidx.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") } @@ -32,20 +32,20 @@ android { dependencies { ksp(projects.hikageCompiler) - api(androidx.appcompat.appcompat) - api(androidx.constraintlayout.constraintlayout) - api(androidx.coordinatorlayout.coordinatorlayout) - api(androidx.swiperefreshlayout.swiperefreshlayout) - api(androidx.slidingpanelayout.slidingpanelayout) - api(androidx.drawerlayout.drawerlayout) - api(androidx.cardview.cardview) - api(androidx.viewpager.viewpager) - api(androidx.viewpager2.viewpager2) - api(androidx.recyclerview.recyclerview) + api(libs.androidx.appcompat) + api(libs.androidx.constraintlayout) + api(libs.androidx.coordinatorlayout) + api(libs.androidx.swiperefreshlayout) + api(libs.androidx.slidingpanelayout) + api(libs.androidx.drawerlayout) + api(libs.androidx.cardview) + api(libs.androidx.viewpager) + api(libs.androidx.viewpager2) + api(libs.androidx.recyclerview) implementation(projects.hikageCore) - 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) } \ No newline at end of file diff --git a/hikage-widget-material/build.gradle.kts b/hikage-widget-material/build.gradle.kts index 9420490..2339d5f 100644 --- a/hikage-widget-material/build.gradle.kts +++ b/hikage-widget-material/build.gradle.kts @@ -1,19 +1,19 @@ plugins { - autowire(libs.plugins.android.library) - autowire(libs.plugins.kotlin.android) - autowire(libs.plugins.maven.publish) - autowire(libs.plugins.kotlin.ksp) + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) + alias(libs.plugins.maven.publish) + alias(libs.plugins.kotlin.ksp) } -group = property.project.groupName -version = property.project.hikage.widget.material.version +group = gropify.project.groupName +version = gropify.project.hikage.widget.material.version android { - namespace = property.project.hikage.widget.material.namespace - compileSdk = property.project.android.compileSdk + namespace = gropify.project.hikage.widget.material.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") } @@ -32,11 +32,11 @@ android { dependencies { ksp(projects.hikageCompiler) - api(com.google.android.material.material) + api(libs.material) implementation(projects.hikageCore) - 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) } \ No newline at end of file diff --git a/samples/app/build.gradle.kts b/samples/app/build.gradle.kts index 760b6d2..691b3b5 100644 --- a/samples/app/build.gradle.kts +++ b/samples/app/build.gradle.kts @@ -1,19 +1,19 @@ plugins { - autowire(libs.plugins.android.application) - autowire(libs.plugins.kotlin.android) - autowire(libs.plugins.kotlin.ksp) + alias(libs.plugins.android.application) + alias(libs.plugins.kotlin.android) + alias(libs.plugins.kotlin.ksp) } android { - namespace = property.project.samples.app.packageName - compileSdk = property.project.android.compileSdk + namespace = gropify.project.samples.app.packageName + compileSdk = gropify.project.android.compileSdk defaultConfig { - applicationId = property.project.samples.app.packageName - minSdk = property.project.android.minSdk - targetSdk = property.project.android.targetSdk - versionName = property.project.samples.app.versionName - versionCode = property.project.samples.app.versionCode + applicationId = gropify.project.samples.app.packageName + minSdk = gropify.project.android.minSdk + targetSdk = gropify.project.android.targetSdk + versionName = gropify.project.samples.app.versionName + versionCode = gropify.project.samples.app.versionCode testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } buildTypes { @@ -43,14 +43,14 @@ dependencies { implementation(projects.hikageWidgetAndroidx) implementation(projects.hikageWidgetMaterial) - implementation(com.highcapable.pangutext.pangutext.android) - implementation(com.highcapable.betterandroid.ui.component) - implementation(com.highcapable.betterandroid.ui.extension) - implementation(com.highcapable.betterandroid.system.extension) - implementation(androidx.core.core.ktx) - implementation(androidx.appcompat.appcompat) + implementation(libs.pangutext.android) + implementation(libs.betterandroid.ui.component) + 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) } \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts index bc2e190..24e40fa 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,4 +1,5 @@ enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") + pluginManagement { repositories { gradlePluginPortal() @@ -7,19 +8,27 @@ 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( + projects( ":hikage-core", ":hikage-core-lint", ":hikage-extension", @@ -29,8 +38,16 @@ sweetProperty { ":hikage-widget-androidx", ":hikage-widget-material" ) { - sourcesCode { - isEnableRestrictedAccess = true + android { + isRestrictedAccessEnabled = true + } + jvm { + isRestrictedAccessEnabled = true + } + } + projects(":samples:app") { + android { + isEnabled = false } } }