diff --git a/app/build.gradle b/app/build.gradle deleted file mode 100644 index a602600a8..000000000 --- a/app/build.gradle +++ /dev/null @@ -1,127 +0,0 @@ -plugins { - id 'com.android.application' - id 'kotlin-android' - id 'kotlin-parcelize' - id 'com.bugsnag.android.gradle' -} - -android { - compileSdk 34 - - defaultConfig { - namespace "com.zacharee1.systemuituner" - applicationId "com.zacharee1.systemuituner" - minSdkVersion 23 - targetSdkVersion 34 - versionCode 361 - versionName versionCode.toString() - - base.archivesName.set("SystemUITuner_${versionCode}") - } - - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } - -// packagingOptions { -// exclude 'META-INF/library_release.kotlin_module' -// } - - compileOptions { - sourceCompatibility JavaVersion.VERSION_11 - targetCompatibility JavaVersion.VERSION_11 - } - - buildFeatures { - viewBinding true - aidl true - compose true - buildConfig true - } - - composeOptions { - kotlinCompilerExtensionVersion = "1.5.8" - } - - kotlinOptions { - jvmTarget = "11" - freeCompilerArgs = ["-Xcontext-receivers"] - } - - androidResources { - generateLocaleConfig = true - } - - dependenciesInfo { - includeInApk = false - includeInBundle = false - } -} - -dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) - - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0-RC2' - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0-RC2' - - implementation 'androidx.appcompat:appcompat:1.6.1' - implementation 'androidx.core:core-ktx:1.12.0' - implementation 'androidx.constraintlayout:constraintlayout:2.1.4' - implementation 'androidx.recyclerview:recyclerview:1.3.2' - implementation 'androidx.annotation:annotation:1.7.1' - implementation 'androidx.preference:preference-ktx:1.2.1' - implementation ('androidx.slidingpanelayout:slidingpanelayout:1.2.0') - implementation "androidx.work:work-runtime-ktx:2.9.0" - - implementation 'com.google.android.material:material:1.11.0' - implementation 'com.google.code.gson:gson:2.10.1' - - implementation 'com.android.billingclient:billing:6.1.0' - implementation 'com.android.billingclient:billing-ktx:6.1.0' - - implementation 'androidx.navigation:navigation-fragment-ktx:2.7.7' - implementation 'androidx.navigation:navigation-ui-ktx:2.7.7' - - implementation 'org.lsposed.hiddenapibypass:hiddenapibypass:4.3' - implementation 'com.github.reddit:IndicatorFastScroll:1.4.0' - implementation "com.github.topjohnwu.libsu:core:5.2.2" - implementation 'jp.wasabeef:recyclerview-animators:4.0.2' - implementation 'io.noties.markwon:core:4.6.2' - implementation 'io.noties.markwon:html:4.6.2' - implementation 'com.joaomgcd:taskerpluginlibrary:0.4.10' - implementation 'dev.rikka.shizuku:api:13.1.5' - implementation 'dev.rikka.shizuku:provider:13.1.5' - implementation 'me.grantland:autofittextview:0.2.1' - - implementation 'com.github.zacharee:material:7b22984aee' - implementation 'com.github.zacharee:PatreonSupportersRetrieval:8436bbdbdc' - implementation 'com.github.zacharee:colorpicker:c300c66e93' - implementation 'com.github.zacharee:SeekBarPreference:1b37341e49' - implementation 'com.github.zacharee:CollapsiblePreferenceCategory:75d1f8b5c5' - implementation 'com.github.zacharee:Android-ExpandableTextView:74f653343d' - implementation 'com.github.zacharee:ComposeIntroSlider:d273cf5734' - implementation 'com.github.zacharee:SystemUITunerSystemSettings:5fb952ba89' - - implementation 'com.bugsnag:bugsnag-android:6.2.0' - implementation 'com.getkeepsafe.relinker:relinker:1.4.5' - - String accompanistVersion = '0.34.0' - implementation "com.google.accompanist:accompanist-themeadapter-material3:${accompanistVersion}" - implementation "com.google.accompanist:accompanist-drawablepainter:${accompanistVersion}" - - implementation 'androidx.compose.material3:material3:1.2.0' - implementation "androidx.compose.foundation:foundation:${compose_version}" - implementation "androidx.compose.animation:animation:${compose_version}" - implementation "androidx.compose.foundation:foundation-layout:${compose_version}" - implementation "androidx.compose.runtime:runtime:${compose_version}" - implementation "androidx.compose.ui:ui:${compose_version}" - implementation "androidx.compose.ui:ui-tooling-preview:${compose_version}" - implementation 'androidx.activity:activity-compose:1.8.2' - implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.7.0' - - debugImplementation "androidx.compose.ui:ui-tooling:${compose_version}" -} diff --git a/app/build.gradle.kts b/app/build.gradle.kts new file mode 100644 index 000000000..c4b2695bd --- /dev/null +++ b/app/build.gradle.kts @@ -0,0 +1,113 @@ +plugins { + alias(libs.plugins.android.application) + alias(libs.plugins.kotlin.android) + alias(libs.plugins.kotlin.parcelize) + alias(libs.plugins.bugsnag.android) +} + +android { + compileSdk = 34 + + defaultConfig { + namespace = "com.zacharee1.systemuituner" + applicationId = "com.zacharee1.systemuituner" + minSdk= 23 + targetSdk = 34 + versionCode = 361 + versionName = versionCode.toString() + + base.archivesName.set("SystemUITuner_${versionCode}") + } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 + } + + buildFeatures { + viewBinding = true + aidl = true + compose = true + buildConfig = true + } + + composeOptions { + kotlinCompilerExtensionVersion = "1.5.9" + } + + kotlinOptions { + jvmTarget = "11" + freeCompilerArgs = listOf("-Xcontext-receivers") + } + + androidResources { + generateLocaleConfig = true + } + + dependenciesInfo { + includeInApk = false + includeInBundle = false + } +} + +dependencies { + implementation(fileTree("libs") { include("*.jar") }) + + implementation(libs.kotlin.stdlib.jdk8) + implementation(libs.kotlinx.coroutines.core) + implementation(libs.kotlinx.coroutines.android) + + implementation(libs.appcompat) + implementation(libs.core.ktx) + implementation(libs.constraintlayout) + implementation(libs.recyclerview) + implementation(libs.annotation) + implementation(libs.preference.ktx) + implementation(libs.slidingpanelayout) + implementation(libs.work.runtime.ktx) + + implementation(libs.material) + implementation(libs.gson) + + implementation(libs.billing) + implementation(libs.billing.ktx) + + implementation(libs.navigation.fragment.ktx) + implementation(libs.navigation.ui.ktx) + + implementation(libs.hiddenapibypass) + implementation(libs.indicatorFastScroll) + implementation(libs.libsu.core) + implementation(libs.recyclerview.animators) + implementation(libs.markwon.core) + implementation(libs.markwon.html) + implementation(libs.taskerpluginlibrary) + implementation(libs.shizuku.api) + implementation(libs.shizuku.provider) + implementation(libs.autofittextview) + + implementation(libs.zacharee.material) + implementation(libs.patreonSupportersRetrieval) + implementation(libs.colorpicker) + implementation(libs.seekBarPreference) + implementation(libs.collapsiblePreferenceCategory) + implementation(libs.android.expandableTextView) + implementation(libs.composeIntroSlider) + implementation(libs.systemUITunerSystemSettings) + + implementation(libs.bugsnag.android) + implementation(libs.relinker) + + implementation(libs.accompanist.themeadapter.material3) + implementation(libs.accompanist.drawablepainter) + + implementation(libs.compose.material3) + implementation(libs.compose.foundation) + implementation(libs.compose.animation) + implementation(libs.compose.foundation.layout) + implementation(libs.compose.runtime) + implementation(libs.compose.ui) + implementation(libs.compose.ui.tooling.preview) + implementation(libs.activity.compose) + implementation(libs.lifecycle.runtime.ktx) +} diff --git a/build.gradle b/build.gradle deleted file mode 100644 index 80b99d702..000000000 --- a/build.gradle +++ /dev/null @@ -1,25 +0,0 @@ -buildscript { - ext.kotlin_version = '1.9.22' - ext.compose_version = '1.6.1' - repositories { - google() - mavenCentral() - } - dependencies { - classpath 'com.android.tools.build:gradle:8.4.0-alpha09' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath 'com.bugsnag:bugsnag-android-gradle-plugin:8.1.0' - } -} - -allprojects { - repositories { - google() - mavenCentral() - maven { url 'https://jitpack.io' } - } -} - -tasks.register('clean', Delete) { - delete rootProject.layout.buildDirectory -} diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 000000000..430e3fe2d --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,10 @@ +plugins { + alias(libs.plugins.android.application) apply false + alias(libs.plugins.kotlin.android) apply false + alias(libs.plugins.kotlin.parcelize) apply false + alias(libs.plugins.bugsnag.android) apply false +} + +tasks.register("clean") { + delete(rootProject.layout.buildDirectory) +} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 000000000..95f9bd7ed --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,99 @@ +[versions] +accompanistVersion = "0.34.0" +activityComposeVersion = "1.8.2" +androidExpandabletextview = "74f653343d" +androidGradlePlugin = "8.4.0-alpha09" +animationVersion = "1.6.1" +annotation = "1.7.1" +shizuku = "13.1.5" +appcompat = "1.6.1" +autofittextview = "0.2.1" +billing = "6.1.0" +bugsnagAndroid = "6.2.0" +bugsnagAndroidGradle = "8.1.0" +collapsiblepreferencecategory = "75d1f8b5c5" +colorpicker = "c300c66e93" +composeintroslider = "d273cf5734" +constraintlayout = "2.1.4" +core = "5.2.2" +coreKtx = "1.12.0" +coreVersion = "4.6.2" +foundationVersion = "1.6.1" +gson = "2.10.1" +hiddenapibypass = "4.3" +indicatorfastscroll = "1.4.0" +kotlin = "1.9.22" +kotlinxCoroutines = "1.8.0-RC2" +lifecycleRuntimeKtxVersion = "2.7.0" +material = "1.11.0" +material3Version = "1.2.0" +materialVersion = "7b22984aee" +navigationFragmentKtx = "2.7.7" +patreonsupportersretrieval = "8436bbdbdc" +preferenceKtx = "1.2.1" +recyclerview = "1.3.2" +recyclerviewAnimators = "4.0.2" +relinker = "1.4.5" +runtimeVersion = "1.6.1" +seekbarpreference = "1b37341e49" +slidingpanelayout = "1.2.0" +systemuitunersystemsettings = "5fb952ba89" +taskerpluginlibrary = "0.4.10" +uiToolingPreviewVersion = "1.6.1" +workRuntimeKtx = "2.9.0" + +[libraries] +accompanist-drawablepainter = { module = "com.google.accompanist:accompanist-drawablepainter", version.ref = "accompanistVersion" } +accompanist-themeadapter-material3 = { module = "com.google.accompanist:accompanist-themeadapter-material3", version.ref = "accompanistVersion" } +activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activityComposeVersion" } +android-expandableTextView = { module = "com.github.zacharee:Android-ExpandableTextView", version.ref = "androidExpandabletextview" } +compose-animation = { module = "androidx.compose.animation:animation", version.ref = "animationVersion" } +annotation = { module = "androidx.annotation:annotation", version.ref = "annotation" } +shizuku-api = { module = "dev.rikka.shizuku:api", version.ref = "shizuku" } +appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" } +autofittextview = { module = "me.grantland:autofittextview", version.ref = "autofittextview" } +billing = { module = "com.android.billingclient:billing", version.ref = "billing" } +billing-ktx = { module = "com.android.billingclient:billing-ktx", version.ref = "billing" } +bugsnag-android = { module = "com.bugsnag:bugsnag-android", version.ref = "bugsnagAndroid" } +collapsiblePreferenceCategory = { module = "com.github.zacharee:CollapsiblePreferenceCategory", version.ref = "collapsiblepreferencecategory" } +colorpicker = { module = "com.github.zacharee:colorpicker", version.ref = "colorpicker" } +composeIntroSlider = { module = "com.github.zacharee:ComposeIntroSlider", version.ref = "composeintroslider" } +constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "constraintlayout" } +libsu-core = { module = "com.github.topjohnwu.libsu:core", version.ref = "core" } +core-ktx = { module = "androidx.core:core-ktx", version.ref = "coreKtx" } +compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "foundationVersion" } +compose-foundation-layout = { module = "androidx.compose.foundation:foundation-layout", version.ref = "foundationVersion" } +gson = { module = "com.google.code.gson:gson", version.ref = "gson" } +hiddenapibypass = { module = "org.lsposed.hiddenapibypass:hiddenapibypass", version.ref = "hiddenapibypass" } +markwon-html = { module = "io.noties.markwon:html", version.ref = "coreVersion" } +indicatorFastScroll = { module = "com.github.reddit:IndicatorFastScroll", version.ref = "indicatorfastscroll" } +kotlin-stdlib-jdk8 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" } +kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlinxCoroutines" } +kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinxCoroutines" } +lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtxVersion" } +markwon-core = { module = "io.noties.markwon:core", version.ref = "coreVersion" } +material = { module = "com.google.android.material:material", version.ref = "material" } +compose-material3 = { module = "androidx.compose.material3:material3", version.ref = "material3Version" } +navigation-fragment-ktx = { module = "androidx.navigation:navigation-fragment-ktx", version.ref = "navigationFragmentKtx" } +navigation-ui-ktx = { module = "androidx.navigation:navigation-ui-ktx", version.ref = "navigationFragmentKtx" } +patreonSupportersRetrieval = { module = "com.github.zacharee:PatreonSupportersRetrieval", version.ref = "patreonsupportersretrieval" } +preference-ktx = { module = "androidx.preference:preference-ktx", version.ref = "preferenceKtx" } +shizuku-provider = { module = "dev.rikka.shizuku:provider", version.ref = "shizuku" } +recyclerview = { module = "androidx.recyclerview:recyclerview", version.ref = "recyclerview" } +recyclerview-animators = { module = "jp.wasabeef:recyclerview-animators", version.ref = "recyclerviewAnimators" } +relinker = { module = "com.getkeepsafe.relinker:relinker", version.ref = "relinker" } +compose-runtime = { module = "androidx.compose.runtime:runtime", version.ref = "runtimeVersion" } +seekBarPreference = { module = "com.github.zacharee:SeekBarPreference", version.ref = "seekbarpreference" } +slidingpanelayout = { module = "androidx.slidingpanelayout:slidingpanelayout", version.ref = "slidingpanelayout" } +systemUITunerSystemSettings = { module = "com.github.zacharee:SystemUITunerSystemSettings", version.ref = "systemuitunersystemsettings" } +taskerpluginlibrary = { module = "com.joaomgcd:taskerpluginlibrary", version.ref = "taskerpluginlibrary" } +compose-ui = { module = "androidx.compose.ui:ui", version.ref = "uiToolingPreviewVersion" } +compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "uiToolingPreviewVersion" } +work-runtime-ktx = { module = "androidx.work:work-runtime-ktx", version.ref = "workRuntimeKtx" } +zacharee-material = { module = "com.github.zacharee:material", version.ref = "materialVersion" } + +[plugins] +android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" } +kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } +kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" } +bugsnag-android = { id = "com.bugsnag.android.gradle", version.ref = "bugsnagAndroidGradle" } diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index b7780608e..000000000 --- a/settings.gradle +++ /dev/null @@ -1,3 +0,0 @@ -rootProject.name='Tweaker' - -include ':app' diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 000000000..78c974fa6 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,25 @@ +pluginManagement { + repositories { + google { + content { + includeGroupByRegex("com\\.android.*") + includeGroupByRegex("com\\.google.*") + includeGroupByRegex("androidx.*") + } + } + mavenCentral() + gradlePluginPortal() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + maven(url = "https://jitpack.io") + } +} + +rootProject.name = "Tweaker" + +include(":app")