Update Dependencies

master
Niko Diamadis 4 years ago
parent 14c37b1be5
commit 103d73f723
Signed by: niko
GPG Key ID: BE53B0B17B1B142E

@ -1,6 +1,5 @@
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
apply plugin: 'kotlin-android' apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'
apply plugin: 'com.google.firebase.crashlytics' apply plugin: 'com.google.firebase.crashlytics'
apply plugin: 'com.google.gms.google-services' apply plugin: 'com.google.gms.google-services'
apply plugin: 'com.mikepenz.aboutlibraries.plugin' apply plugin: 'com.mikepenz.aboutlibraries.plugin'
@ -44,8 +43,8 @@ android {
} }
} }
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8 sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_11
} }
kotlinOptions { kotlinOptions {
jvmTarget = '11' jvmTarget = '11'
@ -59,28 +58,26 @@ android {
} }
dependencies { dependencies {
implementation fileTree(dir: "libs", include: ["*.jar"]) implementation platform('com.google.firebase:firebase-bom:30.0.1')
implementation 'androidx.appcompat:appcompat:1.3.1' implementation "com.mikepenz:aboutlibraries-core:$about_libraries_version"
implementation "com.mikepenz:aboutlibraries:$about_libraries_version"
implementation 'androidx.appcompat:appcompat:1.4.2'
implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.cardview:cardview:1.0.0'
implementation 'androidx.core:core-ktx:1.6.0' implementation 'androidx.core:core-ktx:1.8.0'
implementation "androidx.multidex:multidex:2.0.1" implementation 'androidx.multidex:multidex:2.0.1'
implementation 'androidx.navigation:navigation-fragment-ktx:2.3.5' implementation 'androidx.navigation:navigation-fragment-ktx:2.4.2'
implementation 'androidx.navigation:navigation-ui-ktx:2.3.5' implementation 'androidx.navigation:navigation-ui-ktx:2.4.2'
implementation 'androidx.recyclerview:recyclerview:1.2.1' implementation 'androidx.recyclerview:recyclerview:1.2.1'
implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0" implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
implementation 'com.afollestad.material-dialogs:bottomsheets:3.3.0' implementation 'com.afollestad.material-dialogs:bottomsheets:3.3.0'
implementation 'com.airbnb.android:lottie:3.7.0' implementation 'com.airbnb.android:lottie:3.7.0'
implementation 'com.amitshekhar.android:android-networking:1.0.2' implementation 'com.amitshekhar.android:android-networking:1.0.2'
implementation 'com.github.cyb3rko:about-icons:1.4.0'
implementation 'com.github.GrenderG:Toasty:1.5.0' implementation 'com.github.GrenderG:Toasty:1.5.0'
implementation "com.github.parse-community.Parse-SDK-Android:parse:1.26.0" implementation 'com.github.cyb3rko:about-icons:1.5.0'
implementation 'com.github.parse-community.Parse-SDK-Android:parse:1.26.0'
implementation 'com.google.android.material:material:1.6.1' implementation 'com.google.android.material:material:1.6.1'
implementation 'com.google.firebase:firebase-crashlytics-ktx:18.2.1' implementation 'com.google.firebase:firebase-crashlytics-ktx' // BOM versioning
implementation 'com.itextpdf:itextpdf:5.5.13.2' implementation 'com.itextpdf:itextpdf:5.5.13.2'
implementation "com.mikepenz:aboutlibraries:$about_libraries_version"
implementation "com.mikepenz:aboutlibraries-core:$about_libraries_version"
implementation 'io.github.medyo:android-about-page:2.0.0' implementation 'io.github.medyo:android-about-page:2.0.0'
implementation 'me.ibrahimyilmaz:kiel:1.1.0'
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation project(':installer') implementation project(':installer')
} }

@ -24,7 +24,6 @@ import com.google.android.material.textfield.TextInputEditText
import com.parse.ParseObject import com.parse.ParseObject
import com.parse.ParseQuery import com.parse.ParseQuery
import es.dmoral.toasty.Toasty import es.dmoral.toasty.Toasty
import kotlinx.android.synthetic.main.techniker_dialog.view.*
class ManageTechnikerFragment : Fragment() { class ManageTechnikerFragment : Fragment() {
private var _binding: FragmentManageTechnikerBinding? = null private var _binding: FragmentManageTechnikerBinding? = null
@ -57,8 +56,8 @@ class ManageTechnikerFragment : Fragment() {
customView(R.layout.techniker_dialog, horizontalPadding = true) customView(R.layout.techniker_dialog, horizontalPadding = true)
positiveButton(text = "Hinzufügen") { positiveButton(text = "Hinzufügen") {
val view = it.view val view = it.view
val newName = view.name.text.toString() val newName = view.findViewById<TextInputEditText>(R.id.name).text.toString()
val newAdmin = view.admin.isChecked val newAdmin = view.findViewById<SwitchMaterial>(R.id.admin).isChecked
ParseObject.create(CLASS_TECHNIKER).apply { ParseObject.create(CLASS_TECHNIKER).apply {
put(COLUMN_TECHNIKER_NAME, newName) put(COLUMN_TECHNIKER_NAME, newName)
put(COLUMN_TECHNIKER_ADMIN, newAdmin) put(COLUMN_TECHNIKER_ADMIN, newAdmin)
@ -121,8 +120,8 @@ class ManageTechnikerFragment : Fragment() {
customView(0, dialogView, horizontalPadding = true) customView(0, dialogView, horizontalPadding = true)
onDismiss { onDismiss {
val view = it.view val view = it.view
val newName = view.name.text.toString() val newName = view.findViewById<TextInputEditText>(R.id.name).text.toString()
val newAdmin = view.admin.isChecked val newAdmin = view.findViewById<SwitchMaterial>(R.id.admin).isChecked
val parseObject = techniker[index] val parseObject = techniker[index]
if (newName != parseObject.getString(COLUMN_TECHNIKER_NAME) || if (newName != parseObject.getString(COLUMN_TECHNIKER_NAME) ||
newAdmin != parseObject.getBoolean(COLUMN_TECHNIKER_ADMIN) newAdmin != parseObject.getBoolean(COLUMN_TECHNIKER_ADMIN)

@ -1,18 +1,16 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules. // Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript { buildscript {
ext.about_libraries_version = "8.3.0" ext.about_libraries_version = "8.3.0"
ext.kotlin_version = "1.5.20"
repositories { repositories {
google() google()
jcenter() jcenter()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:7.0.1' classpath 'com.android.tools.build:gradle:7.2.1'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.5.2' classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.0'
classpath 'com.google.gms:google-services:4.3.8' classpath 'com.google.gms:google-services:4.3.12'
classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:$about_libraries_version" classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:$about_libraries_version"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.4.2"
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.3.5"
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files

@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip

@ -10,8 +10,6 @@ android {
defaultConfig { defaultConfig {
minSdkVersion 19 minSdkVersion 19
targetSdkVersion 31 targetSdkVersion 31
versionCode 2
versionName "1.1"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro" consumerProguardFiles "consumer-rules.pro"
@ -38,7 +36,7 @@ android {
dependencies { dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-stdlib:1.5.20"
implementation 'androidx.core:core-ktx:1.6.0' implementation 'androidx.core:core-ktx:1.6.0'
implementation 'androidx.appcompat:appcompat:1.3.1' implementation 'androidx.appcompat:appcompat:1.3.1'
implementation 'com.google.android.material:material:1.4.0' implementation 'com.google.android.material:material:1.4.0'

Loading…
Cancel
Save