diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index adbfe6557c59ce7c1aa751452757ac962e56be48..bfee708956e923e5ec525bdde902de97c6d20870 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: "k8r.eu/justjanne/android-sdk:2ca14765" +image: "k8r.eu/justjanne/android-sdk:cc6bd28f" cache: key: "$CI_PROJECT_NAME" diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 3a8b32a26d6db84713e910ac69a1ba31b213cea9..e405ae75ba062a913bfabee22b242032cce93567 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -158,9 +158,9 @@ dependencies { } // UI - implementation("com.leinardi.android", "speed-dial", "3.0.0") + implementation("com.leinardi.android", "speed-dial", "3.2.0") implementation("me.zhanghai.android.materialprogressbar", "library", "1.6.1") - implementation("com.google.android", "flexbox", "1.1.0") + implementation("com.google.android.flexbox", "flexbox", "3.0.0") implementation(project(":ui_spinner")) withVersion("0.9.6.0") { implementation("com.afollestad.material-dialogs", "core", version) diff --git a/build.gradle.kts b/build.gradle.kts index 7c291e1f9cd003fc85c68350dade5dfaacd8cce0..fde396fd8c6612f60b5b7f74e899e75ebd00eaaa 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -19,24 +19,15 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile * with this program. If not, see <http://www.gnu.org/licenses/>. */ plugins { - java -} - -buildscript { - repositories { - google() - jcenter() - } - dependencies { - classpath("com.android.tools.build:gradle:4.2.1") - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.10") - } + id("com.android.application") version "7.1.1" apply false + id("com.android.library") version "7.1.1" apply false + id("org.jetbrains.kotlin.android") version "1.6.10" apply false } allprojects { repositories { google() - jcenter() + mavenCentral() maven(url = "https://jitpack.io") } diff --git a/gradle.properties b/gradle.properties index db3189ac7f7975a1f83ac32de06d2656113eacce..b7d373b952193ba33704538bb972353b2278fb6b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -27,12 +27,8 @@ org.gradle.jvmargs=-Xmx2048m # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects org.gradle.parallel=true -# Enable new Android D8 Dexer -android.enableD8=true # Enable gradle build cache org.gradle.caching=true -# Enable android build cache -android.enableBuildCache=true # Enable AndroidX android.useAndroidX=true android.enableJetifier=true diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c023ec8b20f512888fe07c5bd3ff77bb8f..7454180f2ae8848c63b8b4dea2cb829da983f2fa 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4e77d0c203e267007aea1a769f2a6f4846edb9bf..cbfa0b7be3da3ffb27298f9965f55a3057d8625d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=0e46229820205440b48a5501122002842b82886e76af35f0f3a069243dca4b3c -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-bin.zip +distributionSha256Szm=23b89f8eac363f5f4b8336e0530c7295c55b728a9caa5268fdd4a532610d5392 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/settings.gradle b/settings.gradle.kts similarity index 70% rename from settings.gradle rename to settings.gradle.kts index ba3c6fc225852162d46facb01443ee206569b702..f5cb528419fc2f62d272983b6535348714c7d4de 100644 --- a/settings.gradle +++ b/settings.gradle.kts @@ -17,14 +17,24 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -rootProject.buildFileName = 'build.gradle.kts' +rootProject.buildFileName = "build.gradle.kts" -include ':app', - ':invokerannotations', - ':invokergenerator', - ':lib', - ':lifecycle-ktx', - ':malheur', - ':persistence', - ':viewmodel', - ':ui_spinner' +include( + ":app", + ":invokerannotations", + ":invokergenerator", + ":lib", + ":lifecycle-ktx", + ":malheur", + ":persistence", + ":viewmodel", + ":ui_spinner" +) + +pluginManagement { + repositories { + gradlePluginPortal() + google() + mavenCentral() + } +}