Release 0.6.0

afollestad · Sep 3, 2018 · 8b488de · 8b488de
1 parent d327033
commit 8b488de
Show file tree

Hide file tree

Showing 20 changed files with 23 additions and 31 deletions.
diff --git a/bintrayconfig.gradle b/bintrayconfig.gradle
@@ -43,4 +43,5 @@ publish {
       '[BETA] A fast and easy to use plug-and-play dynamic theme engine. Powered by Rx, for Android apps.'
   website = 'https://github.com/afollestad/aesthetic'
   dryRun = false
+  override = true
 }
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -2,8 +2,8 @@ ext.versions = [
     minSdk            : 16,
     compileSdk        : 28,
     buildTools        : '28.0.2',
-    publishVersion    : '0.5.3',
-    publishVersionCode: 23,
+    publishVersion    : '0.6.0',
+    publishVersionCode: 24,
 
     gradlePlugin      : '3.1.4',
     kotlin            : '1.2.61',
@@ -12,8 +12,8 @@ ext.versions = [
     bintrayRelease    : '0.8.1',
 
     supportLib        : '28.0.0-rc01',
-    rxJava            : '2.2.0',
-    rxAndroid         : '2.0.2',
+    rxJava            : '2.2.1',
+    rxAndroid         : '2.1.0',
     rxkPrefs          : '1.0.1',
     leakCanary        : '1.6.1'
 ]
diff --git a/library/build.gradle b/library/build.gradle
@@ -28,6 +28,10 @@ android {
         'src/main/res-public'
     ]
   }
+
+  packagingOptions {
+    exclude 'META-INF/library_release.kotlin_module'
+  }
 }
 
 dependencies {

diff --git a/library/src/main/java/com/afollestad/aesthetic/AestheticBottomNavigationView.kt b/library/src/main/java/com/afollestad/aesthetic/AestheticBottomNavigationView.kt
@@ -10,7 +10,6 @@ import android.content.res.ColorStateList
 import android.graphics.Color
 import android.support.annotation.ColorInt
 import android.support.design.widget.BottomNavigationView
-import android.support.v4.content.ContextCompat
 import android.support.v4.content.ContextCompat.getColor
 import android.util.AttributeSet
 import com.afollestad.aesthetic.actions.ViewBackgroundAction
@@ -19,7 +18,6 @@ import com.afollestad.aesthetic.utils.distinctToMainThread
 import com.afollestad.aesthetic.utils.isColorLight
 import com.afollestad.aesthetic.utils.onErrorLogAndRethrow
 import com.afollestad.aesthetic.utils.plusAssign
-import io.reactivex.Observable
 import io.reactivex.Observable.combineLatest
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.disposables.Disposable

diff --git a/library/src/main/java/com/afollestad/aesthetic/AestheticButton.kt b/library/src/main/java/com/afollestad/aesthetic/AestheticButton.kt
@@ -10,15 +10,12 @@ import android.content.res.ColorStateList
 import android.graphics.Color
 import android.support.v7.widget.AppCompatButton
 import android.util.AttributeSet
-import com.afollestad.aesthetic.utils.TintHelper
 import com.afollestad.aesthetic.utils.TintHelper.setTintAuto
-import com.afollestad.aesthetic.utils.ViewUtil
 import com.afollestad.aesthetic.utils.ViewUtil.getObservableForResId
 import com.afollestad.aesthetic.utils.distinctToMainThread
 import com.afollestad.aesthetic.utils.isColorLight
 import com.afollestad.aesthetic.utils.onErrorLogAndRethrow
 import com.afollestad.aesthetic.utils.resId
-import io.reactivex.Observable
 import io.reactivex.Observable.combineLatest
 import io.reactivex.disposables.Disposable
 import io.reactivex.functions.Consumer

diff --git a/library/src/main/java/com/afollestad/aesthetic/AestheticCardView.kt b/library/src/main/java/com/afollestad/aesthetic/AestheticCardView.kt
@@ -9,7 +9,6 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.support.v7.widget.CardView
 import android.util.AttributeSet
-import com.afollestad.aesthetic.utils.ViewUtil
 import com.afollestad.aesthetic.utils.ViewUtil.getObservableForResId
 import com.afollestad.aesthetic.utils.distinctToMainThread
 import com.afollestad.aesthetic.utils.onErrorLogAndRethrow

diff --git a/library/src/main/java/com/afollestad/aesthetic/AestheticCheckBox.kt b/library/src/main/java/com/afollestad/aesthetic/AestheticCheckBox.kt
@@ -9,15 +9,12 @@ import android.content.Context
 import android.support.v7.widget.AppCompatCheckBox
 import android.util.AttributeSet
 import com.afollestad.aesthetic.actions.ViewTextColorAction
-import com.afollestad.aesthetic.utils.TintHelper
 import com.afollestad.aesthetic.utils.TintHelper.setTint
-import com.afollestad.aesthetic.utils.ViewUtil
 import com.afollestad.aesthetic.utils.ViewUtil.getObservableForResId
 import com.afollestad.aesthetic.utils.distinctToMainThread
 import com.afollestad.aesthetic.utils.onErrorLogAndRethrow
 import com.afollestad.aesthetic.utils.plusAssign
 import com.afollestad.aesthetic.utils.resId
-import io.reactivex.Observable
 import io.reactivex.Observable.combineLatest
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.functions.Consumer

diff --git a/library/src/main/java/com/afollestad/aesthetic/AestheticEditText.kt b/library/src/main/java/com/afollestad/aesthetic/AestheticEditText.kt
@@ -12,15 +12,12 @@ import android.support.v7.widget.AppCompatEditText
 import android.util.AttributeSet
 import com.afollestad.aesthetic.actions.ViewHintTextColorAction
 import com.afollestad.aesthetic.actions.ViewTextColorAction
-import com.afollestad.aesthetic.utils.TintHelper
 import com.afollestad.aesthetic.utils.TintHelper.setCursorTint
 import com.afollestad.aesthetic.utils.TintHelper.setTintAuto
-import com.afollestad.aesthetic.utils.ViewUtil
 import com.afollestad.aesthetic.utils.ViewUtil.getObservableForResId
 import com.afollestad.aesthetic.utils.distinctToMainThread
 import com.afollestad.aesthetic.utils.onErrorLogAndRethrow
 import com.afollestad.aesthetic.utils.plusAssign
-import io.reactivex.Observable
 import io.reactivex.Observable.combineLatest
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.functions.Consumer

diff --git a/library/src/main/java/com/afollestad/aesthetic/AestheticFab.kt b/library/src/main/java/com/afollestad/aesthetic/AestheticFab.kt
@@ -12,13 +12,11 @@ import android.support.design.widget.FloatingActionButton
 import android.util.AttributeSet
 import com.afollestad.aesthetic.utils.TintHelper.createTintedDrawable
 import com.afollestad.aesthetic.utils.TintHelper.setTintAuto
-import com.afollestad.aesthetic.utils.ViewUtil
 import com.afollestad.aesthetic.utils.ViewUtil.getObservableForResId
 import com.afollestad.aesthetic.utils.distinctToMainThread
 import com.afollestad.aesthetic.utils.isColorLight
 import com.afollestad.aesthetic.utils.onErrorLogAndRethrow
 import com.afollestad.aesthetic.utils.resId
-import io.reactivex.Observable
 import io.reactivex.Observable.combineLatest
 import io.reactivex.disposables.Disposable
 import io.reactivex.functions.Consumer

diff --git a/library/src/main/java/com/afollestad/aesthetic/AestheticListView.kt b/library/src/main/java/com/afollestad/aesthetic/AestheticListView.kt
@@ -8,7 +8,6 @@ package com.afollestad.aesthetic
 import android.content.Context
 import android.util.AttributeSet
 import android.widget.ListView
-import com.afollestad.aesthetic.utils.EdgeGlowUtil
 import com.afollestad.aesthetic.utils.EdgeGlowUtil.setEdgeGlowColor
 import com.afollestad.aesthetic.utils.distinctToMainThread
 import com.afollestad.aesthetic.utils.onErrorLogAndRethrow

diff --git a/library/src/main/java/com/afollestad/aesthetic/AestheticRadioButton.kt b/library/src/main/java/com/afollestad/aesthetic/AestheticRadioButton.kt
@@ -9,15 +9,12 @@ import android.content.Context
 import android.support.v7.widget.AppCompatRadioButton
 import android.util.AttributeSet
 import com.afollestad.aesthetic.actions.ViewTextColorAction
-import com.afollestad.aesthetic.utils.TintHelper
 import com.afollestad.aesthetic.utils.TintHelper.setTint
-import com.afollestad.aesthetic.utils.ViewUtil
 import com.afollestad.aesthetic.utils.ViewUtil.getObservableForResId
 import com.afollestad.aesthetic.utils.distinctToMainThread
 import com.afollestad.aesthetic.utils.onErrorLogAndRethrow
 import com.afollestad.aesthetic.utils.plusAssign
 import com.afollestad.aesthetic.utils.resId
-import io.reactivex.Observable
 import io.reactivex.Observable.combineLatest
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.functions.Consumer

diff --git a/library/src/main/java/com/afollestad/aesthetic/AestheticRecyclerView.kt b/library/src/main/java/com/afollestad/aesthetic/AestheticRecyclerView.kt
@@ -8,7 +8,6 @@ package com.afollestad.aesthetic
 import android.content.Context
 import android.support.v7.widget.RecyclerView
 import android.util.AttributeSet
-import com.afollestad.aesthetic.utils.EdgeGlowUtil
 import com.afollestad.aesthetic.utils.EdgeGlowUtil.setEdgeGlowColor
 import com.afollestad.aesthetic.utils.distinctToMainThread
 import com.afollestad.aesthetic.utils.onErrorLogAndRethrow

diff --git a/library/src/main/java/com/afollestad/aesthetic/AestheticScrollView.kt b/library/src/main/java/com/afollestad/aesthetic/AestheticScrollView.kt
@@ -8,7 +8,6 @@ package com.afollestad.aesthetic
 import android.content.Context
 import android.util.AttributeSet
 import android.widget.ScrollView
-import com.afollestad.aesthetic.utils.EdgeGlowUtil
 import com.afollestad.aesthetic.utils.EdgeGlowUtil.setEdgeGlowColor
 import com.afollestad.aesthetic.utils.distinctToMainThread
 import com.afollestad.aesthetic.utils.onErrorLogAndRethrow

diff --git a/library/src/main/java/com/afollestad/aesthetic/AestheticSeekBar.kt b/library/src/main/java/com/afollestad/aesthetic/AestheticSeekBar.kt
@@ -8,14 +8,11 @@ package com.afollestad.aesthetic
 import android.content.Context
 import android.support.v7.widget.AppCompatSeekBar
 import android.util.AttributeSet
-import com.afollestad.aesthetic.utils.TintHelper
 import com.afollestad.aesthetic.utils.TintHelper.setTint
-import com.afollestad.aesthetic.utils.ViewUtil
 import com.afollestad.aesthetic.utils.ViewUtil.getObservableForResId
 import com.afollestad.aesthetic.utils.distinctToMainThread
 import com.afollestad.aesthetic.utils.onErrorLogAndRethrow
 import com.afollestad.aesthetic.utils.resId
-import io.reactivex.Observable
 import io.reactivex.Observable.combineLatest
 import io.reactivex.disposables.Disposable
 import io.reactivex.functions.Consumer

diff --git a/library/src/main/java/com/afollestad/aesthetic/AestheticSpinner.kt b/library/src/main/java/com/afollestad/aesthetic/AestheticSpinner.kt
@@ -8,9 +8,7 @@ package com.afollestad.aesthetic
 import android.content.Context
 import android.support.v7.widget.AppCompatSpinner
 import android.util.AttributeSet
-import com.afollestad.aesthetic.utils.TintHelper
 import com.afollestad.aesthetic.utils.TintHelper.setTintAuto
-import com.afollestad.aesthetic.utils.ViewUtil
 import com.afollestad.aesthetic.utils.ViewUtil.getObservableForResId
 import com.afollestad.aesthetic.utils.distinctToMainThread
 import com.afollestad.aesthetic.utils.onErrorLogAndRethrow

diff --git a/library/src/main/java/com/afollestad/aesthetic/AestheticTextView.kt b/library/src/main/java/com/afollestad/aesthetic/AestheticTextView.kt
@@ -9,7 +9,6 @@ import android.content.Context
 import android.support.v7.widget.AppCompatTextView
 import android.util.AttributeSet
 import com.afollestad.aesthetic.actions.ViewTextColorAction
-import com.afollestad.aesthetic.utils.ViewUtil
 import com.afollestad.aesthetic.utils.ViewUtil.getObservableForResId
 import com.afollestad.aesthetic.utils.distinctToMainThread
 import com.afollestad.aesthetic.utils.onErrorLogAndRethrow

diff --git a/library/src/main/java/com/afollestad/aesthetic/AestheticViewPager.kt b/library/src/main/java/com/afollestad/aesthetic/AestheticViewPager.kt
@@ -8,7 +8,6 @@ package com.afollestad.aesthetic
 import android.content.Context
 import android.support.v4.view.ViewPager
 import android.util.AttributeSet
-import com.afollestad.aesthetic.utils.EdgeGlowUtil
 import com.afollestad.aesthetic.utils.EdgeGlowUtil.setEdgeGlowColor
 import com.afollestad.aesthetic.utils.distinctToMainThread
 import com.afollestad.aesthetic.utils.onErrorLogAndRethrow

diff --git a/library/src/main/java/com/afollestad/aesthetic/Modes.kt b/library/src/main/java/com/afollestad/aesthetic/Modes.kt
@@ -1,3 +1,8 @@
+/*
+ * Licensed under Apache-2.0
+ *
+ * Designed and developed by Aidan Follestad (@afollestad)
+ */
 package com.afollestad.aesthetic
 
 /** @author Aidan Follestad (afollestad)*/

diff --git a/library/src/main/java/com/afollestad/aesthetic/States.kt b/library/src/main/java/com/afollestad/aesthetic/States.kt
@@ -1,3 +1,8 @@
+/*
+ * Licensed under Apache-2.0
+ *
+ * Designed and developed by Aidan Follestad (@afollestad)
+ */
 package com.afollestad.aesthetic
 
 import android.R.attr

diff --git a/sample/build.gradle b/sample/build.gradle
@@ -22,6 +22,10 @@ android {
     versionName versions.publishVersion
     vectorDrawables.useSupportLibrary = true
   }
+
+  packagingOptions {
+    exclude 'META-INF/library_release.kotlin_module'
+  }
 }
 
 dependencies {