Skip to content
Snippets Groups Projects
Verified Commit 569114ec authored by Janne Mareike Koschinski's avatar Janne Mareike Koschinski
Browse files

build: cleanup build files

- update gradle
- update android plugin
- update kotlin plugin
- remove jcenter
parent 564c0e4b
No related branches found
No related tags found
No related merge requests found
image: "k8r.eu/justjanne/android-sdk:2ca14765"
image: "k8r.eu/justjanne/android-sdk:cc6bd28f"
cache:
key: "$CI_PROJECT_NAME"
......
......@@ -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)
......
......@@ -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")
}
......
......@@ -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
No preview for this file type
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
......@@ -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()
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment