Merge branch 'master' into add-checklist-top

This commit is contained in:
Tibor Kaputa 2021-09-28 23:22:11 +02:00 committed by GitHub
commit e8edc45b94
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 6 deletions

View File

@ -56,8 +56,8 @@ android {
}
dependencies {
implementation 'com.github.SimpleMobileTools:Simple-Commons:7c0a8d628e'
implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
implementation 'com.github.SimpleMobileTools:Simple-Commons:a74ec200da'
implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
implementation 'androidx.documentfile:documentfile:1.0.1'
kapt 'androidx.room:room-compiler:2.3.0'

View File

@ -135,7 +135,7 @@ class ChecklistFragment : NoteFragment(), ChecklistItemsListener {
private fun showNewItemDialog() {
NewChecklistItemDialog(activity as SimpleActivity) { titles ->
var currentMaxId = items.maxBy { item -> item.id }?.id ?: 0
var currentMaxId = items.maxByOrNull { item -> item.id }?.id ?: 0
val newItems = ArrayList<ChecklistItem>()
titles.forEach { title ->

View File

@ -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.32'
ext.kotlin_version = '1.5.31'
repositories {
google()
@ -9,7 +9,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:4.2.2'
classpath 'com.android.tools.build:gradle:7.0.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// NOTE: Do not place your application dependencies here; they belong

View File

@ -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