From 7d9cb3e150cfd5cdef94eab00973fb89b1d08b54 Mon Sep 17 00:00:00 2001 From: tom5079 Date: Sun, 29 Dec 2019 13:34:45 +0900 Subject: [PATCH 1/3] Dependency update --- app/build.gradle | 6 +++--- libpupil/build.gradle | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 989c908c..bb74f335 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -55,12 +55,12 @@ dependencies { implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0' implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.1.0' implementation 'androidx.legacy:legacy-support-v4:1.0.0' - implementation "androidx.biometric:biometric:1.0.0" + implementation "androidx.biometric:biometric:1.0.1" implementation 'com.android.support:multidex:1.0.3' implementation "com.daimajia.swipelayout:library:1.2.0@aar" - implementation 'com.google.android.material:material:1.2.0-alpha02' + implementation 'com.google.android.material:material:1.2.0-alpha03' implementation 'com.google.firebase:firebase-core:17.2.1' - implementation 'com.google.firebase:firebase-perf:19.0.3' + implementation 'com.google.firebase:firebase-perf:19.0.4' implementation 'com.crashlytics.sdk.android:crashlytics:2.10.1' implementation 'com.github.arimorty:floatingsearchview:2.1.1' implementation 'com.github.clans:fab:1.6.4' diff --git a/libpupil/build.gradle b/libpupil/build.gradle index 055ae4dd..2f748f9e 100644 --- a/libpupil/build.gradle +++ b/libpupil/build.gradle @@ -7,7 +7,7 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.2.1' implementation "org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.14.0" - implementation 'org.jsoup:jsoup:1.11.3' + implementation 'org.jsoup:jsoup:1.12.1' testImplementation 'junit:junit:4.12' } From 66ae29eb5b25639068960b86a631064c494862a7 Mon Sep 17 00:00:00 2001 From: tom5079 Date: Sun, 29 Dec 2019 14:24:20 +0900 Subject: [PATCH 2/3] Fixes #44 --- app/build.gradle | 2 +- app/src/main/java/xyz/quaver/pupil/util/misc.kt | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index bb74f335..61163ead 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,7 +14,7 @@ android { minSdkVersion 16 targetSdkVersion 29 versionCode 31 - versionName "4.2-beta2-hotfix1" + versionName "4.2-beta2-hotfix2" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" multiDexEnabled true vectorDrawables.useSupportLibrary = true diff --git a/app/src/main/java/xyz/quaver/pupil/util/misc.kt b/app/src/main/java/xyz/quaver/pupil/util/misc.kt index a8b1dbad..05deb0fc 100644 --- a/app/src/main/java/xyz/quaver/pupil/util/misc.kt +++ b/app/src/main/java/xyz/quaver/pupil/util/misc.kt @@ -20,16 +20,21 @@ package xyz.quaver.pupil.util import android.content.Context import android.content.pm.PackageManager +import android.os.Build import androidx.core.content.ContextCompat +import java.util.* +import kotlin.collections.ArrayList +//Android Q+ uses scoped storage thus not requiring permission fun Context.hasPermission(permission: String) = - ContextCompat.checkSelfPermission(this, permission) == PackageManager.PERMISSION_GRANTED + Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q || ContextCompat.checkSelfPermission(this, permission) == PackageManager.PERMISSION_GRANTED +@UseExperimental(ExperimentalStdlibApi::class) fun String.wordCapitalize() : String { val result = ArrayList() for (word in this.split(" ")) - result.add(word.capitalize()) + result.add(word.capitalize(Locale.getDefault())) return result.joinToString(" ") } \ No newline at end of file From c59d08a0a1be98556eb66304e08500fbe909884f Mon Sep 17 00:00:00 2001 From: tom5079 Date: Sun, 29 Dec 2019 14:42:28 +0900 Subject: [PATCH 3/3] Fixes #44 --- app/release/output.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/release/output.json b/app/release/output.json index 4995868c..e4bc3315 100644 --- a/app/release/output.json +++ b/app/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":31,"versionName":"4.2-beta2-hotfix1","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}] \ No newline at end of file +[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":31,"versionName":"4.2-beta2-hotfix2","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}] \ No newline at end of file