Libraries update

VladimirWrites · Mar 23, 2019 · 755965d · 755965d
1 parent f821f56
commit 755965d
Show file tree

Hide file tree

Showing 32 changed files with 87 additions and 84 deletions.
diff --git a/README.md b/README.md
@@ -40,7 +40,7 @@ Add to your module's build.gradle:
 and to your app build.gradle:
 
     dependencies {
-            implementation 'com.github.VladimirWrites:Lemniscate:1.4.4'
+            implementation 'com.github.VladimirWrites:Lemniscate:1.4.5'
     }
 
 Usage
@@ -125,4 +125,4 @@ License
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
-    limitations under the License.
+    limitations under the License.
diff --git a/build.gradle b/build.gradle
@@ -1,11 +1,11 @@
 buildscript {
-    ext.kotlin_version = '1.2.31'
+    ext.kotlin_version = '1.3.21'
     repositories {
         jcenter()
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.1'
+        classpath 'com.android.tools.build:gradle:3.3.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Apr 04 19:49:25 CEST 2018
+#Fri Mar 22 22:54:01 CET 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
diff --git a/lemniscate/build.gradle b/lemniscate/build.gradle
@@ -3,18 +3,18 @@ apply plugin: 'kotlin-android'
 apply plugin: 'jacoco'
 
 jacoco {
-    toolVersion = '0.8.0'
+    toolVersion = '0.8.3'
 }
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion "27.0.3"
+    compileSdkVersion 28
+    buildToolsVersion "28.0.3"
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 27
-        versionCode 144
-        versionName "1.4.4"
+        targetSdkVersion 28
+        versionCode 145
+        versionName "1.4.5"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -65,11 +65,11 @@ task jacocoDebugReport(type: JacocoReport, dependsOn: ['testDebugUnitTest', 'cre
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     testImplementation 'junit:junit:4.12'
-    testImplementation 'org.mockito:mockito-core:2.17.0'
-    testImplementation 'com.nhaarman:mockito-kotlin:1.5.0'
-    testImplementation 'com.google.truth:truth:0.40'
-    testImplementation 'org.robolectric:robolectric:3.8'
-    implementation 'com.android.support:appcompat-v7:27.1.1'
+    testImplementation 'org.mockito:mockito-core:2.23.4'
+    testImplementation 'com.nhaarman.mockitokotlin2:mockito-kotlin:2.1.0'
+    testImplementation 'com.google.truth:truth:0.43'
+    testImplementation 'org.robolectric:robolectric:4.2'
+    implementation 'com.android.support:appcompat-v7:28.0.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
 repositories {

diff --git a/lemniscate/src/main/java/com/vlad1m1r/lemniscate/base/BaseCurveProgressView.kt b/lemniscate/src/main/java/com/vlad1m1r/lemniscate/base/BaseCurveProgressView.kt
@@ -202,7 +202,7 @@ abstract class BaseCurveProgressView : View, IBaseCurveView {
         }
 
     public override fun onSaveInstanceState(): Parcelable {
-        val ss = BaseCurveSavedState(super.onSaveInstanceState())
+        val ss = BaseCurveSavedState(super.onSaveInstanceState()!!)
         ss.curveSettings = this.presenter.curveSettings
         ss.animationSettings = this.presenter.animationSettings
         return ss
@@ -260,4 +260,4 @@ abstract class BaseCurveProgressView : View, IBaseCurveView {
     override fun requestProgressViewLayout() {
         requestLayout()
     }
-}
+}
diff --git a/lemniscate/src/main/java/com/vlad1m1r/lemniscate/base/settings/CurveSettings.kt b/lemniscate/src/main/java/com/vlad1m1r/lemniscate/base/settings/CurveSettings.kt
@@ -20,7 +20,7 @@ import android.os.Parcel
 import android.os.Parcelable
 import com.vlad1m1r.lemniscate.base.models.LineLength
 
-open class CurveSettings (val paint: Paint = Paint(Paint.ANTI_ALIAS_FLAG),  var lineLength: LineLength = LineLength()) : Parcelable {
+open class CurveSettings (val paint: Paint = Paint(Paint.ANTI_ALIAS_FLAG), var lineLength: LineLength = LineLength()) : Parcelable {
 
     init {
         paint.style = Paint.Style.STROKE
@@ -29,6 +29,7 @@ open class CurveSettings (val paint: Paint = Paint(Paint.ANTI_ALIAS_FLAG),  var
 
     var precision = 200
     var strokeWidth: Float = 0f
+        @Throws(IllegalArgumentException::class)
         set(value) {
             if (value >= 0) {
                 field = value

diff --git a/lemniscate/src/main/java/com/vlad1m1r/lemniscate/funny/CannabisProgressView.kt b/lemniscate/src/main/java/com/vlad1m1r/lemniscate/funny/CannabisProgressView.kt
@@ -47,8 +47,10 @@ class CannabisProgressView : BaseCurveProgressView {
                     * (1 / 10f * cos(24 * t) + 1)
                     * (1 / 10f * cos(200 * t) + 9 / 10f)) + size / 4
 
+    // Disable hasHole setter. Should stay false
     override var hasHole: Boolean = false
         set(hasHole) {
-            super.hasHole = false
+            super.hasHole = hasHole && false
+            field = hasHole && false
         }
 }
diff --git a/lemniscate/src/main/java/com/vlad1m1r/lemniscate/funny/HeartProgressView.kt b/lemniscate/src/main/java/com/vlad1m1r/lemniscate/funny/HeartProgressView.kt
@@ -41,8 +41,10 @@ class HeartProgressView : BaseCurveProgressView {
                     - 2 * cos(3 * t)
                     - cos(4 * t))
 
+    // Disable hasHole setter. Should stay false
     override var hasHole: Boolean = false
         set(hasHole) {
-            super.hasHole = false
+            super.hasHole = hasHole && false
+            field = hasHole && false
         }
 }
diff --git a/lemniscate/src/main/java/com/vlad1m1r/lemniscate/other/XProgressView.kt b/lemniscate/src/main/java/com/vlad1m1r/lemniscate/other/XProgressView.kt
@@ -38,8 +38,10 @@ class XProgressView : BaseCurveProgressView {
     override fun getGraphY(t: Float): Float =
             size * sin(t) * cos(t)
 
+    // Disable hasHole setter. Should stay false
     override var hasHole: Boolean = false
         set(hasHole) {
-            super.hasHole = false
+            super.hasHole = hasHole && false
+            field = hasHole && false
         }
 }
diff --git a/lemniscate/src/main/java/com/vlad1m1r/lemniscate/roulette/BaseRouletteProgressView.kt b/lemniscate/src/main/java/com/vlad1m1r/lemniscate/roulette/BaseRouletteProgressView.kt
@@ -78,9 +78,11 @@ abstract class BaseRouletteProgressView : BaseCurveProgressView {
 
     internal open fun recalculateConstants() {}
 
+    // Disable hasHole setter. Should stay false
     override var hasHole: Boolean = false
         set(hasHole) {
-            super.hasHole = false
+            super.hasHole = hasHole && false
+            field = hasHole && false
         }
 
 

diff --git a/lemniscate/src/test/java/com/vlad1m1r/lemniscate/BernoullisBowProgressViewTest.kt b/lemniscate/src/test/java/com/vlad1m1r/lemniscate/BernoullisBowProgressViewTest.kt
@@ -1,7 +1,7 @@
 package com.vlad1m1r.lemniscate
 
 import com.google.common.truth.Truth.assertThat
-import com.nhaarman.mockito_kotlin.mock
+import com.nhaarman.mockitokotlin2.mock
 import com.vlad1m1r.lemniscate.testutils.TestConstants
 import com.vlad1m1r.lemniscate.testutils.isPeriodic
 import com.vlad1m1r.lemniscate.testutils.setupDefaultMock
@@ -44,4 +44,4 @@ class BernoullisBowProgressViewTest {
     fun isPeriodic() {
         view.isPeriodic(2 * PI.toFloat())
     }
-}
+}
diff --git a/lemniscate/src/test/java/com/vlad1m1r/lemniscate/BernoullisProgressViewTest.kt b/lemniscate/src/test/java/com/vlad1m1r/lemniscate/BernoullisProgressViewTest.kt
@@ -1,15 +1,14 @@
 package com.vlad1m1r.lemniscate
 
 import com.google.common.truth.Truth.assertThat
-import com.nhaarman.mockito_kotlin.mock
+import com.nhaarman.mockitokotlin2.mock
 import com.vlad1m1r.lemniscate.testutils.TestConstants
 import com.vlad1m1r.lemniscate.testutils.isPeriodic
 import com.vlad1m1r.lemniscate.testutils.setupDefaultMock
 import org.junit.Before
 import org.junit.Test
 import kotlin.math.PI
 
-
 class BernoullisProgressViewTest {
 
     private val view = mock<BernoullisProgressView>()
@@ -45,4 +44,4 @@ class BernoullisProgressViewTest {
     fun isPeriodic() {
         view.isPeriodic(2 * PI.toFloat())
     }
-}
+}
diff --git a/lemniscate/src/test/java/com/vlad1m1r/lemniscate/BernoullisSharpProgressViewTest.kt b/lemniscate/src/test/java/com/vlad1m1r/lemniscate/BernoullisSharpProgressViewTest.kt
@@ -1,15 +1,14 @@
 package com.vlad1m1r.lemniscate
 
 import com.google.common.truth.Truth.assertThat
-import com.nhaarman.mockito_kotlin.mock
+import com.nhaarman.mockitokotlin2.mock
 import com.vlad1m1r.lemniscate.testutils.TestConstants
 import com.vlad1m1r.lemniscate.testutils.isPeriodic
 import com.vlad1m1r.lemniscate.testutils.setupDefaultMock
 import org.junit.Before
 import org.junit.Test
 import kotlin.math.PI
 
-
 class BernoullisSharpProgressViewTest {
 
     private val view = mock<BernoullisSharpProgressView>()
@@ -45,4 +44,4 @@ class BernoullisSharpProgressViewTest {
     fun isPeriodic() {
         view.isPeriodic(2 * PI.toFloat())
     }
-}
+}
diff --git a/lemniscate/src/test/java/com/vlad1m1r/lemniscate/GeronosProgressViewTest.kt b/lemniscate/src/test/java/com/vlad1m1r/lemniscate/GeronosProgressViewTest.kt
@@ -1,7 +1,7 @@
 package com.vlad1m1r.lemniscate
 
 import com.google.common.truth.Truth.assertThat
-import com.nhaarman.mockito_kotlin.mock
+import com.nhaarman.mockitokotlin2.mock
 import com.vlad1m1r.lemniscate.testutils.TestConstants
 import com.vlad1m1r.lemniscate.testutils.isPeriodic
 import com.vlad1m1r.lemniscate.testutils.setupDefaultMock
@@ -44,4 +44,4 @@ class GeronosProgressViewTest {
     fun isPeriodic() {
         view.isPeriodic(2 * PI.toFloat())
     }
-}
+}
diff --git a/lemniscate/src/test/java/com/vlad1m1r/lemniscate/base/BaseCurvePresenterTest.kt b/lemniscate/src/test/java/com/vlad1m1r/lemniscate/base/BaseCurvePresenterTest.kt
@@ -1,7 +1,8 @@
 package com.vlad1m1r.lemniscate.base
 
 import com.google.common.truth.Truth.assertThat
-import com.nhaarman.mockito_kotlin.*
+import com.nhaarman.mockitokotlin2.*
+import com.nhaarman.mockitokotlin2.whenever
 import com.vlad1m1r.lemniscate.base.models.*
 import com.vlad1m1r.lemniscate.base.settings.AnimationSettings
 import com.vlad1m1r.lemniscate.base.settings.CurveSettings
@@ -128,4 +129,4 @@ class BaseCurvePresenterTest {
         presenter.getT(1)
         verify(view).getT(1, curveSettings.precision)
     }
-}
+}
diff --git a/lemniscate/src/test/java/com/vlad1m1r/lemniscate/base/BaseCurveProgressViewTest.kt b/lemniscate/src/test/java/com/vlad1m1r/lemniscate/base/BaseCurveProgressViewTest.kt
@@ -2,14 +2,13 @@ package com.vlad1m1r.lemniscate.base
 
 import android.view.View
 import com.google.common.truth.Truth.assertThat
-import com.nhaarman.mockito_kotlin.any
-import com.nhaarman.mockito_kotlin.doCallRealMethod
-import com.nhaarman.mockito_kotlin.mock
-import com.nhaarman.mockito_kotlin.whenever
+import com.nhaarman.mockitokotlin2.any
+import com.nhaarman.mockitokotlin2.doCallRealMethod
+import com.nhaarman.mockitokotlin2.mock
+import com.nhaarman.mockitokotlin2.whenever
 import org.junit.Before
 import org.junit.Test
 
-
 class BaseCurveProgressViewTest {
 
     val baseCurve: BaseCurve = BaseCurve()
@@ -75,4 +74,4 @@ class BaseCurveProgressViewTest {
 
         override fun requestProgressViewLayout() {}
     }
-}
+}
diff --git a/lemniscate/src/test/java/com/vlad1m1r/lemniscate/base/BaseProgressViewAttributesTest.kt b/lemniscate/src/test/java/com/vlad1m1r/lemniscate/base/BaseProgressViewAttributesTest.kt
@@ -4,7 +4,7 @@ import android.content.Context
 import android.content.res.TypedArray
 import android.util.AttributeSet
 import com.google.common.truth.Truth.assertThat
-import com.nhaarman.mockito_kotlin.*
+import com.nhaarman.mockitokotlin2.*
 import com.vlad1m1r.lemniscate.BernoullisProgressView
 import com.vlad1m1r.lemniscate.sample.lemniscate.R
 import com.vlad1m1r.lemniscate.testutils.TestLayoutInflater
@@ -56,4 +56,4 @@ class BaseProgressViewAttributesTest {
 
         assertThat(bernoullisProgressView.duration).isEqualTo(999)
     }
-}
+}
diff --git a/lemniscate/src/test/java/com/vlad1m1r/lemniscate/base/models/DrawStateTest.kt b/lemniscate/src/test/java/com/vlad1m1r/lemniscate/base/models/DrawStateTest.kt
@@ -2,7 +2,7 @@ package com.vlad1m1r.lemniscate.base.models
 
 import android.graphics.Path
 import com.google.common.truth.Truth.assertThat
-import com.nhaarman.mockito_kotlin.*
+import com.nhaarman.mockitokotlin2.*
 import com.vlad1m1r.lemniscate.base.settings.CurveSettings
 import org.junit.Test
 import org.mockito.Mockito.inOrder
@@ -172,4 +172,4 @@ class DrawStateTest {
         verify(path).reset()
     }
 
-}
+}
diff --git a/lemniscate/src/test/java/com/vlad1m1r/lemniscate/base/models/LineLengthParcelableTest.kt b/lemniscate/src/test/java/com/vlad1m1r/lemniscate/base/models/LineLengthParcelableTest.kt
@@ -8,7 +8,6 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
 
-
 @RunWith(RobolectricTestRunner::class)
 class LineLengthParcelableTest {
 

diff --git a/...te/src/test/java/com/vlad1m1r/lemniscate/base/settings/AnimationSettingsParcelableTest.kt b/...te/src/test/java/com/vlad1m1r/lemniscate/base/settings/AnimationSettingsParcelableTest.kt
@@ -8,7 +8,6 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
 
-
 @RunWith(RobolectricTestRunner::class)
 class AnimationSettingsParcelableTest {
 

diff --git a/lemniscate/src/test/java/com/vlad1m1r/lemniscate/base/settings/CurveSettingsTest.kt b/lemniscate/src/test/java/com/vlad1m1r/lemniscate/base/settings/CurveSettingsTest.kt
@@ -2,7 +2,7 @@ package com.vlad1m1r.lemniscate.base.settings
 
 import android.graphics.Paint
 import com.google.common.truth.Truth.assertThat
-import com.nhaarman.mockito_kotlin.mock
+import com.nhaarman.mockitokotlin2.mock
 import com.vlad1m1r.lemniscate.base.models.LineLength
 import org.junit.Assert.assertEquals
 import org.junit.Before
@@ -43,4 +43,4 @@ class CurveSettingsTest {
         assertEquals(123, curveSettings.color.toLong())
         verify<Paint>(paint).color = 123
     }
-}
+}
diff --git a/lemniscate/src/test/java/com/vlad1m1r/lemniscate/funny/CannabisProgressViewTest.kt b/lemniscate/src/test/java/com/vlad1m1r/lemniscate/funny/CannabisProgressViewTest.kt
@@ -1,7 +1,7 @@
 package com.vlad1m1r.lemniscate.funny
 
 import com.google.common.truth.Truth.assertThat
-import com.nhaarman.mockito_kotlin.mock
+import com.nhaarman.mockitokotlin2.mock
 import com.vlad1m1r.lemniscate.testutils.TestConstants
 import com.vlad1m1r.lemniscate.testutils.isPeriodic
 import com.vlad1m1r.lemniscate.testutils.setupDefaultMock
@@ -60,4 +60,4 @@ class CannabisProgressViewHasHoleTest {
         view.hasHole = true
         assertThat(view.hasHole).isFalse()
     }
-}
+}
diff --git a/lemniscate/src/test/java/com/vlad1m1r/lemniscate/funny/HeartProgressViewTest.kt b/lemniscate/src/test/java/com/vlad1m1r/lemniscate/funny/HeartProgressViewTest.kt
@@ -1,7 +1,7 @@
 package com.vlad1m1r.lemniscate.funny
 
 import com.google.common.truth.Truth.assertThat
-import com.nhaarman.mockito_kotlin.mock
+import com.nhaarman.mockitokotlin2.mock
 import com.vlad1m1r.lemniscate.testutils.TestConstants
 import com.vlad1m1r.lemniscate.testutils.isPeriodic
 import com.vlad1m1r.lemniscate.testutils.setupDefaultMock
@@ -60,4 +60,4 @@ class HeartProgressViewHasHoleTest {
         view.hasHole = true
         assertThat(view.hasHole).isFalse()
     }
-}
+}
diff --git a/lemniscate/src/test/java/com/vlad1m1r/lemniscate/other/XProgressViewTest.kt b/lemniscate/src/test/java/com/vlad1m1r/lemniscate/other/XProgressViewTest.kt
@@ -1,7 +1,7 @@
 package com.vlad1m1r.lemniscate.other
 
 import com.google.common.truth.Truth.assertThat
-import com.nhaarman.mockito_kotlin.mock
+import com.nhaarman.mockitokotlin2.mock
 import com.vlad1m1r.lemniscate.testutils.TestConstants
 import com.vlad1m1r.lemniscate.testutils.isPeriodic
 import com.vlad1m1r.lemniscate.testutils.setupDefaultMock
@@ -60,4 +60,4 @@ class XProgressViewHasHoleTest {
         view.hasHole = true
         assertThat(view.hasHole).isFalse()
     }
-}
+}