From 8ebfd423e97efc21d176e60aa64f66d19d5147ab Mon Sep 17 00:00:00 2001 From: Jonas Lochmann Date: Mon, 16 May 2022 02:00:00 +0200 Subject: [PATCH] Update buildtools and dependencies --- app/build.gradle | 9 ++++----- build.gradle | 25 ++++++++++++++++++++---- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 3 files changed, 27 insertions(+), 11 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 8695da9..4fbd95d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,5 +1,5 @@ /* - * Open TimeLimit Copyright 2019 - 2021 Jonas Lochmann + * Open TimeLimit Copyright 2019 - 2022 Jonas Lochmann * Copyright 2020 Marcel Voigt * * This program is free software: you can redistribute it and/or modify @@ -85,10 +85,9 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation 'androidx.appcompat:appcompat:1.4.1' implementation 'androidx.core:core:1.7.0' - implementation 'androidx.legacy:legacy-support-v4:1.0.0' implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.gridlayout:gridlayout:1.0.0' - implementation "com.google.android.material:material:1.5.0" + implementation "com.google.android.material:material:1.6.0" implementation 'androidx.fragment:fragment-ktx:1.4.1' implementation "androidx.navigation:navigation-fragment-ktx:$nav_version" @@ -115,9 +114,9 @@ dependencies { implementation 'org.mindrot:jbcrypt:0.4' - implementation 'com.getkeepsafe.taptargetview:taptargetview:1.11.0' + implementation 'com.getkeepsafe.taptargetview:taptargetview:1.13.3' - implementation 'com.google.android:flexbox:1.0.0' + implementation 'com.google.android.flexbox:flexbox:3.0.0' implementation 'com.squareup.okio:okio:2.8.0' diff --git a/build.gradle b/build.gradle index 4d3c64a..ca10f46 100644 --- a/build.gradle +++ b/build.gradle @@ -1,13 +1,30 @@ +/* + * Open TimeLimit Copyright 2019 - 2022 Jonas Lochmann + * Copyright 2020 Marcel Voigt + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 3 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.6.20' + ext.kotlin_version = '1.6.21' repositories { google() - jcenter() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.1.3' + classpath 'com.android.tools.build:gradle:7.2.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'androidx.navigation:navigation-safe-args-gradle-plugin:2.4.2' @@ -19,7 +36,7 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b87e74a..83070a0 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -2,5 +2,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip -distributionSha256Sum=f581709a9c35e9cb92e16f585d2c4bc99b2b1a5f85d2badbd3dc6bff59e1e6dd \ No newline at end of file +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip +distributionSha256Sum=c9490e938b221daf0094982288e4038deed954a3f12fb54cbf270ddf4e37d879 \ No newline at end of file