From 943d6d3dedd0e905889c01dcc9c063012ada5a1e Mon Sep 17 00:00:00 2001 From: Rupal Singh Date: Sun, 15 Sep 2019 13:46:05 +0100 Subject: [PATCH] chore : changed target api to 29 --- .travis.yml | 4 ++-- .../java/org/fossasia/badgemagic/ui/custom/PreviewBadge.kt | 4 ++-- versions.gradle | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3522cb2f1..cbec1c4ca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,8 +6,8 @@ jdk: android: components: - tools - - android-28 - - build-tools-28.0.3 + - android-29 + - build-tools-29.0.2 - platform-tools before_cache: - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock diff --git a/app/src/main/java/org/fossasia/badgemagic/ui/custom/PreviewBadge.kt b/app/src/main/java/org/fossasia/badgemagic/ui/custom/PreviewBadge.kt index bc0870131..312bbb71f 100644 --- a/app/src/main/java/org/fossasia/badgemagic/ui/custom/PreviewBadge.kt +++ b/app/src/main/java/org/fossasia/badgemagic/ui/custom/PreviewBadge.kt @@ -121,12 +121,12 @@ class PreviewBadge : View { this.ifMarquee = currentState.getBoolean(BUNDLE_MARQUEE) this.badgeSpeed = currentState.getInt(BUNDLE_SPEED) this.badgeMode = Mode.values()[currentState.getInt(BUNDLE_MODE)] - this.checkList = currentState.getParcelableArrayList(BUNDLE_CHECKLIST) + this.checkList = currentState.getParcelableArrayList(BUNDLE_CHECKLIST) ?: ArrayList() countFrame = 0 lastFrame = 0 - currentState = currentState.getParcelable(BUNDLE_STATE) as Parcelable + currentState.getParcelable(BUNDLE_STATE)?.let { currentState = it } } super.onRestoreInstanceState(currentState) } diff --git a/versions.gradle b/versions.gradle index c8670c652..bc63ccb9d 100644 --- a/versions.gradle +++ b/versions.gradle @@ -1,9 +1,9 @@ ext.versions = [:] -versions.compileSdk = 28 -versions.buildTools = '28.0.3' +versions.compileSdk = 29 +versions.buildTools = '29.0.2' versions.minSdk = 21 -versions.targetSdk = 28 +versions.targetSdk = 29 versions.kotlin_version = '1.3.41'