From 451f6082ffcccde159ae2809f26a14bf3e01d2ec Mon Sep 17 00:00:00 2001 From: Jannik Date: Wed, 16 Sep 2020 18:38:13 +0200 Subject: [PATCH] traget android sdk 30 --- app/build.gradle | 13 ++++++++----- .../uicomponents/dialogs/CourseSelectionDialog.kt | 2 +- build.gradle | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index ca6e14e..0e1ffe2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,15 +3,18 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' android { + signingConfigs { } - compileSdkVersion 29 + compileSdkVersion 30 + buildToolsVersion "30.0.2" + defaultConfig { applicationId "org.mosad.seil0.projectlaogai" minSdkVersion 23 - targetSdkVersion 29 - versionCode 6090 // 0006000 + targetSdkVersion 30 + versionCode 6090 // 00.06.090 versionName "0.6.1-beta1" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" resValue "string", "build_time", buildTime() @@ -69,7 +72,7 @@ dependencies { implementation 'androidx.security:security-crypto:1.1.0-alpha02' implementation 'androidx.work:work-runtime:2.4.0' implementation "androidx.work:work-runtime-ktx:2.4.0" - implementation 'com.google.android.material:material:1.2.0' + implementation 'com.google.android.material:material:1.2.1' implementation 'com.google.code.gson:gson:2.8.6' implementation 'com.afollestad:aesthetic:1.0.0-beta05' implementation 'com.afollestad.material-dialogs:core:3.3.0' @@ -82,7 +85,7 @@ dependencies { testImplementation 'org.junit.jupiter:junit-jupiter:5.6.2' androidTestImplementation 'androidx.test:core:1.3.0' - androidTestImplementation 'androidx.test.ext:junit:1.1.1' + androidTestImplementation 'androidx.test.ext:junit:1.1.2' } static def buildTime() { diff --git a/app/src/main/java/org/mosad/seil0/projectlaogai/uicomponents/dialogs/CourseSelectionDialog.kt b/app/src/main/java/org/mosad/seil0/projectlaogai/uicomponents/dialogs/CourseSelectionDialog.kt index ec10332..9163702 100644 --- a/app/src/main/java/org/mosad/seil0/projectlaogai/uicomponents/dialogs/CourseSelectionDialog.kt +++ b/app/src/main/java/org/mosad/seil0/projectlaogai/uicomponents/dialogs/CourseSelectionDialog.kt @@ -38,7 +38,7 @@ class CourseSelectionDialog(val context: Context) { } fun listItems(func: CourseSelectionDialog.() -> Unit): CourseSelectionDialog = apply { - dialog.listItems(items = list) { dialog, index, text -> + dialog.listItems(items = list) { _, index, _ -> selectedIndex = index func() diff --git a/build.gradle b/build.gradle index 982f6ef..11b1574 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.4.0' + ext.kotlin_version = '1.4.10' repositories { google() jcenter()