From f0e7ee13b7528be056439b3a49a0a96abccd8d7f Mon Sep 17 00:00:00 2001 From: Niko Diamadis Date: Sat, 4 Sep 2021 12:50:35 +0200 Subject: [PATCH] Aktualisiere internen Code und Dependencies --- app/build.gradle | 12 ++++----- app/src/main/AndroidManifest.xml | 1 + .../fragments/ProjectFragment.kt | 26 ------------------- build.gradle | 4 +-- gradle/wrapper/gradle-wrapper.properties | 2 +- installer/build.gradle | 19 +++++++------- 6 files changed, 20 insertions(+), 44 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 30d3cc7..c6119e3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -18,13 +18,13 @@ android { keyPassword properties.getProperty("signing.key.password") } } - compileSdkVersion 30 - buildToolsVersion "29.0.3" + compileSdkVersion 31 + buildToolsVersion "30.0.3" defaultConfig { applicationId "com.cyb3rko.techniklogger" minSdkVersion 19 - targetSdkVersion 30 + targetSdkVersion 31 versionCode 8 versionName "1.5.1" multiDexEnabled true @@ -48,7 +48,7 @@ android { targetCompatibility JavaVersion.VERSION_1_8 } kotlinOptions { - jvmTarget = '1.8' + jvmTarget = '11' } buildFeatures { viewBinding true @@ -60,7 +60,7 @@ android { dependencies { implementation fileTree(dir: "libs", include: ["*.jar"]) - implementation 'androidx.appcompat:appcompat:1.3.0' + implementation 'androidx.appcompat:appcompat:1.3.1' implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.core:core-ktx:1.6.0' implementation "androidx.multidex:multidex:2.0.1" @@ -76,7 +76,7 @@ dependencies { implementation 'com.github.GrenderG:Toasty:1.5.0' implementation "com.github.parse-community.Parse-SDK-Android:parse:1.26.0" implementation 'com.google.android.material:material:1.3.0-alpha03' - implementation 'com.google.firebase:firebase-crashlytics-ktx:18.1.0' + implementation 'com.google.firebase:firebase-crashlytics-ktx:18.2.1' implementation 'com.itextpdf:itextpdf:5.5.13.2' implementation "com.mikepenz:aboutlibraries:$about_libraries_version" implementation "com.mikepenz:aboutlibraries-core:$about_libraries_version" diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d47f1d0..f166225 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -17,6 +17,7 @@ tools:ignore="AllowBackup" android:name=".App"> diff --git a/app/src/main/java/com/cyb3rko/techniklogger/fragments/ProjectFragment.kt b/app/src/main/java/com/cyb3rko/techniklogger/fragments/ProjectFragment.kt index 56f747b..fcc2dcd 100644 --- a/app/src/main/java/com/cyb3rko/techniklogger/fragments/ProjectFragment.kt +++ b/app/src/main/java/com/cyb3rko/techniklogger/fragments/ProjectFragment.kt @@ -11,8 +11,6 @@ import androidx.fragment.app.Fragment import androidx.navigation.fragment.navArgs import androidx.recyclerview.widget.LinearLayoutManager import com.afollestad.materialdialogs.MaterialDialog -import com.afollestad.materialdialogs.input.getInputField -import com.afollestad.materialdialogs.input.input import com.afollestad.materialdialogs.list.isItemChecked import com.afollestad.materialdialogs.list.listItemsMultiChoice import com.afollestad.materialdialogs.list.uncheckItems @@ -25,7 +23,6 @@ import com.google.android.material.timepicker.TimeFormat import com.parse.ParseObject import com.parse.ParseQuery import es.dmoral.toasty.Toasty -import java.lang.IndexOutOfBoundsException import me.ibrahimyilmaz.kiel.adapter.RecyclerViewAdapter.Companion.adapterOf import me.ibrahimyilmaz.kiel.adapter.RecyclerViewAdapter import me.ibrahimyilmaz.kiel.core.RecyclerViewHolder @@ -436,27 +433,4 @@ class ProjectFragment : Fragment() { binding.divider.visibility = View.GONE } } - - private fun showNameDialog() { - val currentName = myContext.getSharedPreferences("Safe", 0).getString("name", "") - - MaterialDialog(myContext) - .cancelable(false) - .title(0, "Bitte gebe deinen Namen ein") - .show { - input(hint = "Dein Name", prefill = currentName, waitForPositiveButton = false) { dialog, inputName -> - try { - if (!inputName[0].isUpperCase()) { - dialog.getInputField().error = "Der Anfangsbuchstabe sollte groß sein" - } - } catch (ignored: IndexOutOfBoundsException) { - } - - positiveButton { - myContext.getSharedPreferences("Safe", 0).edit().putString("name", inputName.toString()).apply() - } - } - positiveButton(0, "Speichern") - } - } } diff --git a/build.gradle b/build.gradle index 4dfe1b3..204b56a 100644 --- a/build.gradle +++ b/build.gradle @@ -7,8 +7,8 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.2' - classpath 'com.google.firebase:firebase-crashlytics-gradle:2.3.0' + classpath 'com.android.tools.build:gradle:7.0.1' + classpath 'com.google.firebase:firebase-crashlytics-gradle:2.5.2' classpath 'com.google.gms:google-services:4.3.8' classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:$about_libraries_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ef882b5..2b01f57 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip diff --git a/installer/build.gradle b/installer/build.gradle index 5c6e0a2..778c516 100644 --- a/installer/build.gradle +++ b/installer/build.gradle @@ -4,12 +4,12 @@ plugins { } android { - compileSdkVersion 30 + compileSdkVersion 31 buildToolsVersion "30.0.3" defaultConfig { minSdkVersion 19 - targetSdkVersion 30 + targetSdkVersion 31 versionCode 2 versionName "1.1" @@ -18,10 +18,14 @@ android { } buildTypes { - release { + debug { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } + release { + minifyEnabled true + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } } compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 @@ -35,10 +39,7 @@ android { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - implementation 'androidx.core:core-ktx:1.3.2' - implementation 'androidx.appcompat:appcompat:1.2.0' - implementation 'com.google.android.material:material:1.2.1' - testImplementation 'junit:junit:4.+' - androidTestImplementation 'androidx.test.ext:junit:1.1.2' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' + implementation 'androidx.core:core-ktx:1.6.0' + implementation 'androidx.appcompat:appcompat:1.3.1' + implementation 'com.google.android.material:material:1.4.0' } \ No newline at end of file