From ba1f3857f6f14d38ce6e5bdbe87316daf39fe7bd Mon Sep 17 00:00:00 2001 From: LoveSy Date: Wed, 22 Mar 2023 10:27:17 +0800 Subject: [PATCH] Declare dependencies in toml instead of settings (#2448) --- gradle/libs.versions.toml | 65 +++++++++++++++++++++++++++++++++++++ settings.gradle.kts | 68 --------------------------------------- 2 files changed, 65 insertions(+), 68 deletions(-) create mode 100644 gradle/libs.versions.toml diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 00000000..ba2433bd --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,65 @@ +[versions] +agp = "7.4.2" +kotlin = "1.8.10" +nav = "2.5.3" +appcenter = "5.0.0" +libxposed = "100" +glide = "4.15.0" +okhttp = "4.10.0" + +[plugins] +agp-lib = { id = "com.android.library", version.ref = "agp" } +agp-app = { id = "com.android.application", version.ref = "agp" } +kotlin = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } +nav-safeargs = { id = "androidx.navigation.safeargs", version.ref = "nav" } +autoresconfig = { id = "dev.rikka.tools.autoresconfig", version = "1.2.2" } +materialthemebuilder = { id = "dev.rikka.tools.materialthemebuilder", version = "1.3.3" } +lsplugin-resopt = { id = "org.lsposed.lsplugin.resopt", version = "1.3" } +lsplugin-apksign = { id = "org.lsposed.lsplugin.apksign", version = "1.1" } +lsplugin-cmaker = { id = "org.lsposed.lsplugin.cmaker", version = "1.0" } +lsplugin-jgit = { id = "org.lsposed.lsplugin.jgit", version = "1.0" } + +[libraries] +appcenter-crashes = { group = "com.microsoft.appcenter", name = "appcenter-crashes", version.ref = "appcenter" } +appcenter-analytics = { group = "com.microsoft.appcenter", name = "appcenter-analytics", version.ref = "appcenter" } + +rikkax-appcompat = { module = "dev.rikka.rikkax.appcompat:appcompat", version = "1.6.1" } +rikkax-core = { module = "dev.rikka.rikkax.core:core", version = "1.4.1" } +rikkax-insets = { module = "dev.rikka.rikkax.insets:insets", version = "1.3.0" } +rikkax-layoutinflater = { module = "dev.rikka.rikkax.layoutinflater:layoutinflater", version = "1.3.0" } +rikkax-material = { module = "dev.rikka.rikkax.material:material", version = "2.5.1" } +rikkax-material-preference = { module = "dev.rikka.rikkax.material:material-preference", version = "2.0.0" } +rikkax-parcelablelist = { module = "dev.rikka.rikkax.parcelablelist:parcelablelist", version = "2.0.1" } +rikkax-preference = { module = "dev.rikka.rikkax.material:material-preference", version = "2.0.0" } +rikkax-recyclerview = { module = "dev.rikka.rikkax.recyclerview:recyclerview-ktx", version = "1.3.1" } +rikkax-widget-borderview = { module = "dev.rikka.rikkax.widget:borderview", version = "1.1.0" } +rikkax-widget-mainswitchbar = { module = "dev.rikka.rikkax.widget:mainswitchbar", version = "1.0.2" } + +androidx-activity = { module = "androidx.activity:activity", version = "1.6.1" } +androidx-annotation = { module = "androidx.annotation:annotation", version = "1.6.0" } +androidx-browser = { module = "androidx.browser:browser", version = "1.5.0" } +androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version = "2.1.4" } +androidx-core = { module = "androidx.core:core", version = "1.9.0" } +androidx-fragment = { module = "androidx.fragment:fragment", version = "1.5.5" } +androidx-navigation-fragment = { group = "androidx.navigation", name = "navigation-fragment", version.ref = "nav" } +androidx-navigation-ui = { group = "androidx.navigation", name = "navigation-ui", version.ref = "nav" } +androidx-preference = { module = "androidx.preference:preference", version = "1.2.0" } +androidx-recyclerview = { module = "androidx.recyclerview:recyclerview", version = "1.3.0" } +androidx-swiperefreshlayout = { module = "androidx.swiperefreshlayout:swiperefreshlayout", version = "1.2.0-alpha01" } + +glide = { group = "com.github.bumptech.glide", name = "glide", version.ref = "glide" } +glide-compiler = { group = "com.github.bumptech.glide", name = "compiler", version.ref = "glide" } + +okhttp = { group = "com.squareup.okhttp3", name = "okhttp", version.ref = "okhttp" } +okhttp-dnsoverhttps = { group = "com.squareup.okhttp3", name = "okhttp-dnsoverhttps", version.ref = "okhttp" } +okhttp-logging-interceptor = { group = "com.squareup.okhttp3", name = "logging-interceptor", version.ref = "okhttp" } + +agp-apksig = { group = "com.android.tools.build", name = "apksig", version.ref = "agp" } +appiconloader = { module = "me.zhanghai.android.appiconloader:appiconloader", version = "1.5.0" } +axml = { module = "de.upb.cs.swt:axml", version = "2.1.3" } +commons-lang3 = { module = "org.apache.commons:commons-lang3", version = "3.12.0" } +material = { module = "com.google.android.material:material", version = "1.8.0" } +gson = { module = "com.google.code.gson:gson", version = "2.10.1" } +hiddenapibypass = { module = "org.lsposed.hiddenapibypass:hiddenapibypass", version = "4.3" } +kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" } +kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version = "1.6.4" } diff --git a/settings.gradle.kts b/settings.gradle.kts index 34ff013a..b721b31b 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -3,9 +3,6 @@ import java.net.URI enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") pluginManagement { - val navVersion: String by settings - val agpVersion: String by settings - val kotlinVersion: String by settings repositories { gradlePluginPortal() google() @@ -22,77 +19,12 @@ dependencyResolutionManagement { } versionCatalogs { create("libs") { - val agpVersion = version("agp", "7.4.2") - val kotlinVersion = version("kotlin", "1.8.10") - val navVersion = version("nav", "2.5.3") - val appCenterVersion = version("appcenter", "5.0.0") - val libxposedVersion = version("libxposed", "100") - val glideVersion = version("glide", "4.15.0") - val okhttpVersion = version("okhttp", "4.10.0") - - plugin("agp-lib", "com.android.library").versionRef(agpVersion) - plugin("agp-app", "com.android.application").versionRef(agpVersion) - plugin("kotlin", "org.jetbrains.kotlin.android").versionRef(kotlinVersion) - plugin("nav-safeargs", "androidx.navigation.safeargs").versionRef(navVersion) - plugin("autoresconfig", "dev.rikka.tools.autoresconfig").version("1.2.2") - plugin("materialthemebuilder", "dev.rikka.tools.materialthemebuilder").version("1.3.3") - plugin("lsplugin-resopt", "org.lsposed.lsplugin.resopt").version("1.3") - plugin("lsplugin-apksign", "org.lsposed.lsplugin.apksign").version("1.1") - plugin("lsplugin-cmaker", "org.lsposed.lsplugin.cmaker").version("1.0") - plugin("lsplugin-jgit", "org.lsposed.lsplugin.jgit").version("1.0") - - library("appcenter-crashes", "com.microsoft.appcenter", "appcenter-crashes").versionRef(appCenterVersion) - library("appcenter-analytics", "com.microsoft.appcenter", "appcenter-analytics").versionRef(appCenterVersion) - library("libxposed-api", "io.github.libxposed", "api").version { branch = "master" } library("libxposed-interface", "io.github.libxposed", "interface").version { branch = "master" } - - - library("rikkax-appcompat", "dev.rikka.rikkax.appcompat:appcompat:1.6.1") - library("rikkax-core", "dev.rikka.rikkax.core:core:1.4.1") - library("rikkax-insets", "dev.rikka.rikkax.insets:insets:1.3.0") - library("rikkax-layoutinflater", "dev.rikka.rikkax.layoutinflater:layoutinflater:1.3.0") - library("rikkax-material", "dev.rikka.rikkax.material:material:2.5.1") - library("rikkax-material-preference", "dev.rikka.rikkax.material:material-preference:2.0.0") - library("rikkax-parcelablelist", "dev.rikka.rikkax.parcelablelist:parcelablelist:2.0.1") - library("rikkax-preference", "dev.rikka.rikkax.preference:simplemenu-preference:1.0.3") - library("rikkax-recyclerview", "dev.rikka.rikkax.recyclerview:recyclerview-ktx:1.3.1") - library("rikkax-widget-borderview", "dev.rikka.rikkax.widget:borderview:1.1.0") - library("rikkax-widget-mainswitchbar", "dev.rikka.rikkax.widget:mainswitchbar:1.0.2") - - library("androidx-activity", "androidx.activity:activity:1.6.1") - library("androidx-annotation", "androidx.annotation:annotation:1.6.0") - library("androidx-browser", "androidx.browser:browser:1.5.0") - library("androidx-constraintlayout", "androidx.constraintlayout:constraintlayout:2.1.4") - library("androidx-core", "androidx.core:core:1.9.0") - library("androidx-fragment", "androidx.fragment:fragment:1.5.5") - library("androidx-navigation-fragment", "androidx.navigation", "navigation-fragment").versionRef(navVersion) - library("androidx-navigation-ui", "androidx.navigation", "navigation-ui").versionRef(navVersion) - library("androidx-preference", "androidx.preference:preference:1.2.0") - library("androidx-recyclerview", "androidx.recyclerview:recyclerview:1.3.0") - library("androidx-swiperefreshlayout", "androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01") - - library("glide", "com.github.bumptech.glide", "glide").versionRef(glideVersion) - library("glide-compiler", "com.github.bumptech.glide", "compiler").versionRef(glideVersion) - - library("okhttp", "com.squareup.okhttp3", "okhttp").versionRef(okhttpVersion) - library("okhttp-dnsoverhttps", "com.squareup.okhttp3", "okhttp-dnsoverhttps").versionRef(okhttpVersion) - library("okhttp-logging-interceptor", "com.squareup.okhttp3", "logging-interceptor").versionRef(okhttpVersion) - - - library("agp-apksig", "com.android.tools.build", "apksig").versionRef(agpVersion) - library("appiconloader", "me.zhanghai.android.appiconloader:appiconloader:1.5.0") - library("axml", "de.upb.cs.swt:axml:2.1.3") - library("commons-lang3", "org.apache.commons:commons-lang3:3.12.0") - library("material", "com.google.android.material:material:1.8.0") - library("gson", "com.google.code.gson:gson:2.10.1") - library("hiddenapibypass", "org.lsposed.hiddenapibypass:hiddenapibypass:4.3") - library("kotlin-stdlib", "org.jetbrains.kotlin", "kotlin-stdlib").versionRef(kotlinVersion) - library("kotlinx-coroutines-core", "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4") } } }