From dfdc670d38976fb16449153257c364557aa8cb33 Mon Sep 17 00:00:00 2001 From: VladimirWrites Date: Thu, 28 Apr 2022 22:16:13 +0200 Subject: [PATCH] Update dependencies --- README.md | 2 +- buildSrc/src/main/java/Dependencies.kt | 37 +++++++++---------- gradle/wrapper/gradle-wrapper.properties | 2 +- lemniscate/build.gradle | 15 +++++--- .../BernoullisBowProgressViewTest.kt | 2 +- .../lemniscate/BernoullisProgressViewTest.kt | 2 +- .../BernoullisSharpProgressViewTest.kt | 2 +- .../lemniscate/GeronosProgressViewTest.kt | 2 +- .../lemniscate/base/BaseCurvePresenterTest.kt | 2 +- .../base/BaseCurveProgressViewTest.kt | 5 +-- .../lemniscate/base/models/DrawStateTest.kt | 2 +- .../base/settings/CurveSettingsTest.kt | 2 +- .../funny/CannabisProgressViewTest.kt | 2 +- .../lemniscate/funny/HeartProgressViewTest.kt | 2 +- .../lemniscate/other/XProgressViewTest.kt | 2 +- .../roulette/EpitrochoidProgressViewTest.kt | 4 +- .../roulette/HypotrochoidProgressViewTest.kt | 4 +- .../scribble/RoundScribbleProgressViewTest.kt | 4 +- .../scribble/ScribbleProgressViewTest.kt | 4 +- .../lemniscate/testutils/CurveTestUtils.kt | 4 +- sample/build.gradle | 2 - sample/src/main/AndroidManifest.xml | 3 +- 22 files changed, 47 insertions(+), 59 deletions(-) diff --git a/README.md b/README.md index 1277208..bb9185b 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ and to your app `build.gradle`: ###### AndroidX ```groovy dependencies { - implementation 'com.github.VladimirWrites:Lemniscate:2.0.2' + implementation 'com.github.VladimirWrites:Lemniscate:2.0.4' } ``` diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt index fe80c06..e7d7021 100644 --- a/buildSrc/src/main/java/Dependencies.kt +++ b/buildSrc/src/main/java/Dependencies.kt @@ -1,34 +1,33 @@ object Versions { - const val kotlin = "1.4.10" + const val kotlin = "1.6.21" - const val android_x = "1.2.0" + const val android_x = "1.4.1" - const val circleindicator = "2.1.4" + const val circleindicator = "2.1.6" - const val junit = "4.13.1" - const val mockito_core = "3.5.15" - const val mockito_kotlin = "2.2.0" - const val truth = "1.1" - const val robolectric = "4.4" + const val junit = "4.13.2" + const val mockito_core = "4.5.1" + const val mockito_kotlin = "4.0.0" + const val truth = "1.1.3" + const val robolectric = "4.7.3" - const val gradle_android = "4.0.2" - const val jacoco = "0.8.6" + const val gradle_android = "7.1.3" + const val jacoco = "0.8.8" const val min_sdk = 14 - const val target_sdk = 29 - const val compile_sdk = 29 - const val build_tools = "29.0.3" + const val target_sdk = 31 + const val compile_sdk = 31 - const val lemniscate_version_code = 203 - const val lemniscate_version_name = "2.0.3" + const val lemniscate_version_code = 204 + const val lemniscate_version_name = "2.0.4" - const val sample_version_code = 132 - const val sample_version_name = "1.3.2" + const val sample_version_code = 133 + const val sample_version_name = "1.3.3" } object Deps { - const val kotlin_stdlib = "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${Versions.kotlin}" + const val kotlin_stdlib = "org.jetbrains.kotlin:kotlin-stdlib:${Versions.kotlin}" const val appcompat = "androidx.appcompat:appcompat:${Versions.android_x}" @@ -36,7 +35,7 @@ object Deps { const val junit = "junit:junit:${Versions.junit}" const val mockito_core = "org.mockito:mockito-core:${Versions.mockito_core}" - const val mockito_kotlin = "com.nhaarman.mockitokotlin2:mockito-kotlin:${Versions.mockito_kotlin}" + const val mockito_kotlin = "org.mockito.kotlin:mockito-kotlin:${Versions.mockito_kotlin}" const val truth = "com.google.truth:truth:${Versions.truth}" const val robolectric = "org.robolectric:robolectric:${Versions.robolectric}" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 5f78f94..3aff549 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip diff --git a/lemniscate/build.gradle b/lemniscate/build.gradle index a417c90..6d19b59 100644 --- a/lemniscate/build.gradle +++ b/lemniscate/build.gradle @@ -8,7 +8,6 @@ jacoco { android { compileSdkVersion Versions.compile_sdk - buildToolsVersion Versions.build_tools defaultConfig { minSdkVersion Versions.min_sdk @@ -44,9 +43,15 @@ android { task jacocoDebugReport(type: JacocoReport, dependsOn: ['testDebugUnitTest']) { reports { - csv.enabled = false - xml.enabled = true - html.enabled = true + csv { + enabled true + } + xml { + enabled true + } + html { + enabled true + } } def fileFilter = ['**/R.class', '**/R$*.class', '**/BuildConfig.*', '**/Manifest*.*', '**/*Test*.*', 'android/**/*.*'] @@ -63,8 +68,6 @@ task jacocoDebugReport(type: JacocoReport, dependsOn: ['testDebugUnitTest']) { } dependencies { - implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation Deps.appcompat implementation Deps.kotlin_stdlib diff --git a/lemniscate/src/test/java/com/vlad1m1r/lemniscate/BernoullisBowProgressViewTest.kt b/lemniscate/src/test/java/com/vlad1m1r/lemniscate/BernoullisBowProgressViewTest.kt index ee87c0f..bf699b0 100644 --- a/lemniscate/src/test/java/com/vlad1m1r/lemniscate/BernoullisBowProgressViewTest.kt +++ b/lemniscate/src/test/java/com/vlad1m1r/lemniscate/BernoullisBowProgressViewTest.kt @@ -1,12 +1,12 @@ package com.vlad1m1r.lemniscate import com.google.common.truth.Truth.assertThat -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 org.mockito.kotlin.mock import kotlin.math.PI class BernoullisBowProgressViewTest { diff --git a/lemniscate/src/test/java/com/vlad1m1r/lemniscate/BernoullisProgressViewTest.kt b/lemniscate/src/test/java/com/vlad1m1r/lemniscate/BernoullisProgressViewTest.kt index 8ac3478..e9015aa 100644 --- a/lemniscate/src/test/java/com/vlad1m1r/lemniscate/BernoullisProgressViewTest.kt +++ b/lemniscate/src/test/java/com/vlad1m1r/lemniscate/BernoullisProgressViewTest.kt @@ -1,7 +1,7 @@ package com.vlad1m1r.lemniscate import com.google.common.truth.Truth.assertThat -import com.nhaarman.mockitokotlin2.mock +import org.mockito.kotlin.mock import com.vlad1m1r.lemniscate.testutils.TestConstants import com.vlad1m1r.lemniscate.testutils.isPeriodic import com.vlad1m1r.lemniscate.testutils.setupDefaultMock diff --git a/lemniscate/src/test/java/com/vlad1m1r/lemniscate/BernoullisSharpProgressViewTest.kt b/lemniscate/src/test/java/com/vlad1m1r/lemniscate/BernoullisSharpProgressViewTest.kt index 878a89a..b93ceaa 100644 --- a/lemniscate/src/test/java/com/vlad1m1r/lemniscate/BernoullisSharpProgressViewTest.kt +++ b/lemniscate/src/test/java/com/vlad1m1r/lemniscate/BernoullisSharpProgressViewTest.kt @@ -1,12 +1,12 @@ package com.vlad1m1r.lemniscate import com.google.common.truth.Truth.assertThat -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 org.mockito.kotlin.mock import kotlin.math.PI class BernoullisSharpProgressViewTest { diff --git a/lemniscate/src/test/java/com/vlad1m1r/lemniscate/GeronosProgressViewTest.kt b/lemniscate/src/test/java/com/vlad1m1r/lemniscate/GeronosProgressViewTest.kt index 15ab095..61f4883 100644 --- 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.mockitokotlin2.mock +import org.mockito.kotlin.mock import com.vlad1m1r.lemniscate.testutils.TestConstants import com.vlad1m1r.lemniscate.testutils.isPeriodic import com.vlad1m1r.lemniscate.testutils.setupDefaultMock diff --git a/lemniscate/src/test/java/com/vlad1m1r/lemniscate/base/BaseCurvePresenterTest.kt b/lemniscate/src/test/java/com/vlad1m1r/lemniscate/base/BaseCurvePresenterTest.kt index 2b22deb..cd6b682 100644 --- 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,7 @@ package com.vlad1m1r.lemniscate.base import com.google.common.truth.Truth.assertThat -import com.nhaarman.mockitokotlin2.* +import org.mockito.kotlin.* import com.vlad1m1r.lemniscate.base.models.* import com.vlad1m1r.lemniscate.base.settings.AnimationSettings import com.vlad1m1r.lemniscate.base.settings.CurveSettings diff --git a/lemniscate/src/test/java/com/vlad1m1r/lemniscate/base/BaseCurveProgressViewTest.kt b/lemniscate/src/test/java/com/vlad1m1r/lemniscate/base/BaseCurveProgressViewTest.kt index 5c544d5..2d364c0 100644 --- a/lemniscate/src/test/java/com/vlad1m1r/lemniscate/base/BaseCurveProgressViewTest.kt +++ b/lemniscate/src/test/java/com/vlad1m1r/lemniscate/base/BaseCurveProgressViewTest.kt @@ -2,10 +2,7 @@ package com.vlad1m1r.lemniscate.base import android.view.View import com.google.common.truth.Truth.assertThat -import com.nhaarman.mockitokotlin2.any -import com.nhaarman.mockitokotlin2.doCallRealMethod -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.* import org.junit.Before import org.junit.Test 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 index 4717870..46d6652 100644 --- 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.mockitokotlin2.* +import org.mockito.kotlin.* import com.vlad1m1r.lemniscate.base.settings.CurveSettings import org.junit.Test import org.mockito.Mockito.inOrder 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 index e324793..5347964 100644 --- 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.mockitokotlin2.mock +import org.mockito.kotlin.mock import com.vlad1m1r.lemniscate.base.models.LineLength import org.junit.Assert.assertEquals import org.junit.Before diff --git a/lemniscate/src/test/java/com/vlad1m1r/lemniscate/funny/CannabisProgressViewTest.kt b/lemniscate/src/test/java/com/vlad1m1r/lemniscate/funny/CannabisProgressViewTest.kt index e34be31..9bc2ab3 100644 --- a/lemniscate/src/test/java/com/vlad1m1r/lemniscate/funny/CannabisProgressViewTest.kt +++ b/lemniscate/src/test/java/com/vlad1m1r/lemniscate/funny/CannabisProgressViewTest.kt @@ -3,7 +3,7 @@ package com.vlad1m1r.lemniscate.funny import android.os.Build import androidx.test.platform.app.InstrumentationRegistry import com.google.common.truth.Truth.assertThat -import com.nhaarman.mockitokotlin2.mock +import org.mockito.kotlin.mock import com.vlad1m1r.lemniscate.testutils.TestConstants import com.vlad1m1r.lemniscate.testutils.isPeriodic import com.vlad1m1r.lemniscate.testutils.setupDefaultMock diff --git a/lemniscate/src/test/java/com/vlad1m1r/lemniscate/funny/HeartProgressViewTest.kt b/lemniscate/src/test/java/com/vlad1m1r/lemniscate/funny/HeartProgressViewTest.kt index 544a38b..ab57456 100644 --- a/lemniscate/src/test/java/com/vlad1m1r/lemniscate/funny/HeartProgressViewTest.kt +++ b/lemniscate/src/test/java/com/vlad1m1r/lemniscate/funny/HeartProgressViewTest.kt @@ -3,7 +3,7 @@ package com.vlad1m1r.lemniscate.funny import android.os.Build import androidx.test.platform.app.InstrumentationRegistry import com.google.common.truth.Truth.assertThat -import com.nhaarman.mockitokotlin2.mock +import org.mockito.kotlin.mock import com.vlad1m1r.lemniscate.testutils.TestConstants import com.vlad1m1r.lemniscate.testutils.isPeriodic import com.vlad1m1r.lemniscate.testutils.setupDefaultMock diff --git a/lemniscate/src/test/java/com/vlad1m1r/lemniscate/other/XProgressViewTest.kt b/lemniscate/src/test/java/com/vlad1m1r/lemniscate/other/XProgressViewTest.kt index 9b48a18..9a27338 100644 --- a/lemniscate/src/test/java/com/vlad1m1r/lemniscate/other/XProgressViewTest.kt +++ b/lemniscate/src/test/java/com/vlad1m1r/lemniscate/other/XProgressViewTest.kt @@ -3,7 +3,7 @@ package com.vlad1m1r.lemniscate.other import android.os.Build import androidx.test.platform.app.InstrumentationRegistry import com.google.common.truth.Truth.assertThat -import com.nhaarman.mockitokotlin2.mock +import org.mockito.kotlin.mock import com.vlad1m1r.lemniscate.testutils.TestConstants import com.vlad1m1r.lemniscate.testutils.isPeriodic import com.vlad1m1r.lemniscate.testutils.setupDefaultMock diff --git a/lemniscate/src/test/java/com/vlad1m1r/lemniscate/roulette/EpitrochoidProgressViewTest.kt b/lemniscate/src/test/java/com/vlad1m1r/lemniscate/roulette/EpitrochoidProgressViewTest.kt index 181efcf..b2422f5 100644 --- a/lemniscate/src/test/java/com/vlad1m1r/lemniscate/roulette/EpitrochoidProgressViewTest.kt +++ b/lemniscate/src/test/java/com/vlad1m1r/lemniscate/roulette/EpitrochoidProgressViewTest.kt @@ -3,9 +3,7 @@ package com.vlad1m1r.lemniscate.roulette import android.os.Build import androidx.test.platform.app.InstrumentationRegistry import com.google.common.truth.Truth.assertThat -import com.nhaarman.mockitokotlin2.doCallRealMethod -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.* import com.vlad1m1r.lemniscate.testutils.TestConstants.DELTA import com.vlad1m1r.lemniscate.testutils.isPeriodic import com.vlad1m1r.lemniscate.testutils.setupDefaultMock diff --git a/lemniscate/src/test/java/com/vlad1m1r/lemniscate/roulette/HypotrochoidProgressViewTest.kt b/lemniscate/src/test/java/com/vlad1m1r/lemniscate/roulette/HypotrochoidProgressViewTest.kt index 20d267d..d761229 100644 --- a/lemniscate/src/test/java/com/vlad1m1r/lemniscate/roulette/HypotrochoidProgressViewTest.kt +++ b/lemniscate/src/test/java/com/vlad1m1r/lemniscate/roulette/HypotrochoidProgressViewTest.kt @@ -3,9 +3,7 @@ package com.vlad1m1r.lemniscate.roulette import android.os.Build import androidx.test.platform.app.InstrumentationRegistry import com.google.common.truth.Truth.assertThat -import com.nhaarman.mockitokotlin2.doCallRealMethod -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.* import com.vlad1m1r.lemniscate.testutils.TestConstants.DELTA import com.vlad1m1r.lemniscate.testutils.isPeriodic import com.vlad1m1r.lemniscate.testutils.setupDefaultMock diff --git a/lemniscate/src/test/java/com/vlad1m1r/lemniscate/roulette/scribble/RoundScribbleProgressViewTest.kt b/lemniscate/src/test/java/com/vlad1m1r/lemniscate/roulette/scribble/RoundScribbleProgressViewTest.kt index 83d0e58..909b3df 100644 --- a/lemniscate/src/test/java/com/vlad1m1r/lemniscate/roulette/scribble/RoundScribbleProgressViewTest.kt +++ b/lemniscate/src/test/java/com/vlad1m1r/lemniscate/roulette/scribble/RoundScribbleProgressViewTest.kt @@ -3,9 +3,7 @@ package com.vlad1m1r.lemniscate.roulette.scribble import android.os.Build import androidx.test.platform.app.InstrumentationRegistry import com.google.common.truth.Truth.assertThat -import com.nhaarman.mockitokotlin2.doCallRealMethod -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.* import com.vlad1m1r.lemniscate.testutils.TestConstants.DELTA import com.vlad1m1r.lemniscate.testutils.isPeriodic import com.vlad1m1r.lemniscate.testutils.setupDefaultMock diff --git a/lemniscate/src/test/java/com/vlad1m1r/lemniscate/roulette/scribble/ScribbleProgressViewTest.kt b/lemniscate/src/test/java/com/vlad1m1r/lemniscate/roulette/scribble/ScribbleProgressViewTest.kt index dee3434..7c7ee8b 100644 --- a/lemniscate/src/test/java/com/vlad1m1r/lemniscate/roulette/scribble/ScribbleProgressViewTest.kt +++ b/lemniscate/src/test/java/com/vlad1m1r/lemniscate/roulette/scribble/ScribbleProgressViewTest.kt @@ -3,9 +3,7 @@ package com.vlad1m1r.lemniscate.roulette.scribble import android.os.Build import androidx.test.platform.app.InstrumentationRegistry import com.google.common.truth.Truth.assertThat -import com.nhaarman.mockitokotlin2.doCallRealMethod -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.* import com.vlad1m1r.lemniscate.testutils.TestConstants.DELTA import com.vlad1m1r.lemniscate.testutils.isPeriodic import com.vlad1m1r.lemniscate.testutils.setupDefaultMock diff --git a/lemniscate/src/test/java/com/vlad1m1r/lemniscate/testutils/CurveTestUtils.kt b/lemniscate/src/test/java/com/vlad1m1r/lemniscate/testutils/CurveTestUtils.kt index ac8c5b4..6719b26 100644 --- a/lemniscate/src/test/java/com/vlad1m1r/lemniscate/testutils/CurveTestUtils.kt +++ b/lemniscate/src/test/java/com/vlad1m1r/lemniscate/testutils/CurveTestUtils.kt @@ -1,9 +1,7 @@ package com.vlad1m1r.lemniscate.testutils import com.google.common.truth.Truth -import com.nhaarman.mockitokotlin2.any -import com.nhaarman.mockitokotlin2.doCallRealMethod -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.* import com.vlad1m1r.lemniscate.base.BaseCurveProgressView import com.vlad1m1r.lemniscate.roulette.BaseRouletteProgressView diff --git a/sample/build.gradle b/sample/build.gradle index 3249c74..6a10683 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -4,7 +4,6 @@ apply plugin: 'kotlin-android-extensions' android { compileSdkVersion Versions.compile_sdk - buildToolsVersion Versions.build_tools defaultConfig { applicationId "com.vlad1m1r.lemniscate.sample" @@ -22,7 +21,6 @@ android { } dependencies { - implementation fileTree(include: ['*.jar'], dir: 'libs') implementation Deps.appcompat implementation Deps.circleindicator implementation Deps.kotlin_stdlib diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml index 762ceb7..0ddff9b 100644 --- a/sample/src/main/AndroidManifest.xml +++ b/sample/src/main/AndroidManifest.xml @@ -10,7 +10,8 @@ android:supportsRtl="true" android:theme="@style/AppTheme"> + android:name=".MainActivity" + android:exported="true">