diff --git a/app/build.gradle b/app/build.gradle index 14eb3f6eea..8bcd1b4c56 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,10 +1,10 @@ import java.nio.file.Files plugins { - id 'com.android.application' - id 'com.google.protobuf' - id 'kotlin-android' - id 'kotlin-parcelize' + alias(libs.plugins.android.application) + alias(libs.plugins.kotlin.android) + alias(libs.plugins.kotlin.parcelize) + alias(libs.plugins.protobuf) } tasks.withType(Test).configureEach { diff --git a/build.gradle b/build.gradle deleted file mode 100644 index c71606147e..0000000000 --- a/build.gradle +++ /dev/null @@ -1,33 +0,0 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. - -buildscript { - ext.kotlin_version = '2.3.20' - repositories { - mavenCentral() - google() - maven { - url = 'https://plugins.gradle.org/m2/' - } - } - dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath 'com.android.tools.build:gradle:8.13.2' - - classpath 'com.google.protobuf:protobuf-gradle-plugin:0.10.0' - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files - } -} - -allprojects { - repositories { - mavenCentral() - maven { - url = 'https://jitpack.io' - content { - includeGroupByRegex "com\\.github\\..*" - } - } - google() - } -} diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000000..83e86b4b90 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,8 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. + +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.protobuf) apply false +} diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index 6579a81e8f..0000000000 --- a/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -include ':app', ':GBDaoGenerator' diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000000..41f392946f --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,36 @@ +pluginManagement { + repositories { + google { + content { + includeGroupByRegex("com\\.android.*") + includeGroupByRegex("com\\.google.*") + includeGroupByRegex("androidx\\..*") + } + } + gradlePluginPortal() + mavenCentral() + } +} +dependencyResolutionManagement { + repositoriesMode = RepositoriesMode.FAIL_ON_PROJECT_REPOS + repositories { + google { + content { + includeGroupByRegex("com\\.android.*") + includeGroupByRegex("com\\.google.*") + includeGroupByRegex("androidx\\..*") + } + } + mavenCentral() + maven("https://jitpack.io") { + content { + includeGroupByRegex("com\\.github\\..*") + } + } + } +} + +rootProject.name = "Gadgetbridge" + +include(":app") +include(":GBDaoGenerator") \ No newline at end of file