Upgrade targetSdkVersion to 29 (cortinico#99)

* Upgrade targetSdkVersion to 29 * Update .travis.yml * Update .travis.yml (cortinico#2) * Update .travis.yml * Update .travis.yml
prepared911 · Jan 5, 2020 · 35a89cd · 35a89cd
1 parent 8dad986
commit 35a89cd
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,9 +6,9 @@ os:
     - linux
 env:
   global:
-    - ANDROID_API_LEVEL=28
+    - ANDROID_API_LEVEL=29
     - EMULATOR_API_LEVEL=21
-    - ANDROID_BUILD_TOOLS_VERSION=28.0.3
+    - ANDROID_BUILD_TOOLS_VERSION=29.0.0
     - ANDROID_ABI=armeabi-v7a
     - ANDROID_TAG=google_apis
     - ADB_INSTALL_TIMEOUT=20
@@ -23,5 +23,9 @@ android:
     - extra-android-m2repository
     - extra-google-m2repository
 
+before_install:
+  - yes | sdkmanager "platforms;android-29"
+  - yes | sdkmanager "build-tools;28.0.3"
+
 script:
    - ./gradlew clean build lint test
diff --git a/example/build.gradle b/example/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
 
     defaultConfig {
         applicationId "com.ncorti.slidetoact.example"
         minSdkVersion 14
-        targetSdkVersion 28
+        targetSdkVersion 29
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

diff --git a/slidetoact/build.gradle b/slidetoact/build.gradle
@@ -6,11 +6,11 @@ apply plugin: 'com.jfrog.bintray'
 version = "0.7.0"
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 28
+        targetSdkVersion 29
         versionCode 7
         versionName "0.7.0"
         vectorDrawables.useSupportLibrary = true

diff --git a/slidetoact/src/main/java/com/ncorti/slidetoact/SlideToActView.kt b/slidetoact/src/main/java/com/ncorti/slidetoact/SlideToActView.kt
@@ -281,7 +281,7 @@ class SlideToActView @JvmOverloads constructor (
                 else -> defaultWhite
             }
 
-            text = layoutAttrs.getString(R.styleable.SlideToActView_text)
+            text = layoutAttrs.getString(R.styleable.SlideToActView_text) ?: ""
             typeFace = layoutAttrs.getInt(R.styleable.SlideToActView_text_style, 0)
             mTextSize = layoutAttrs.getDimensionPixelSize(R.styleable.SlideToActView_text_size, resources.getDimensionPixelSize(R.dimen.slidetoact_default_text_size))
             textColor = actualTextColor