Merge pull request #12973 from wordpress-mobile/fix/update-kotlin-to-…

…1.4.10 Update kotlin to 1.4.10
wordpress-mobile · Nov 10, 2020 · 0da07a0 · 0da07a0
2 parents 1797c18 + 3554747
commit 0da07a0
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 30 deletions.
diff --git a/WordPress/src/test/java/org/wordpress/android/CoroutinesUtils.kt b/WordPress/src/test/java/org/wordpress/android/CoroutinesUtils.kt
@@ -6,7 +6,6 @@ import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Delay
 import kotlinx.coroutines.Dispatchers.Unconfined
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.InternalCoroutinesApi
 import kotlinx.coroutines.runBlocking
 import org.mockito.Mockito
@@ -24,7 +23,7 @@ fun <T : Any, R> KStubbing<T>.onBlocking(methodCall: suspend T.() -> R): Ongoing
     return runBlocking { Mockito.`when`(mock.methodCall()) }
 }
 
-@ExperimentalCoroutinesApi val TEST_SCOPE = CoroutineScope(Unconfined)
+val TEST_SCOPE = CoroutineScope(Unconfined)
 @InternalCoroutinesApi val TEST_DISPATCHER: CoroutineDispatcher = TestDispatcher()
 
 @InternalCoroutinesApi

diff --git a/WordPress/src/test/java/org/wordpress/android/ui/posts/PostListMainViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/posts/PostListMainViewModelTest.kt
@@ -9,7 +9,6 @@ import com.nhaarman.mockitokotlin2.times
 import com.nhaarman.mockitokotlin2.verify
 import com.nhaarman.mockitokotlin2.whenever
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.InternalCoroutinesApi
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.Before
@@ -39,7 +38,6 @@ class PostListMainViewModelTest : BaseUnitTest() {
     private lateinit var viewModel: PostListMainViewModel
 
     @InternalCoroutinesApi
-    @UseExperimental(ExperimentalCoroutinesApi::class)
     @Before
     fun setUp() {
         val prefs = mock<AppPrefsWrapper> {

diff --git a/...rc/test/java/org/wordpress/android/ui/reader/discover/ReaderPostCardActionsHandlerTest.kt b/...rc/test/java/org/wordpress/android/ui/reader/discover/ReaderPostCardActionsHandlerTest.kt
@@ -6,7 +6,6 @@ import com.nhaarman.mockitokotlin2.eq
 import com.nhaarman.mockitokotlin2.mock
 import com.nhaarman.mockitokotlin2.verify
 import com.nhaarman.mockitokotlin2.whenever
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.InternalCoroutinesApi
 import kotlinx.coroutines.flow.flowOf
 import org.assertj.core.api.Assertions.assertThat
@@ -73,7 +72,6 @@ import org.wordpress.android.ui.utils.HtmlMessageUtils
 import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
 import org.wordpress.android.viewmodel.ResourceProvider
 
-@ExperimentalCoroutinesApi
 @InternalCoroutinesApi
 @RunWith(MockitoJUnitRunner::class)
 class ReaderPostCardActionsHandlerTest {

diff --git a/...rc/test/java/org/wordpress/android/ui/reader/repository/ReaderDiscoverDataProviderTest.kt b/...rc/test/java/org/wordpress/android/ui/reader/repository/ReaderDiscoverDataProviderTest.kt
@@ -4,7 +4,6 @@ import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import androidx.lifecycle.Observer
 import com.nhaarman.mockitokotlin2.verify
 import com.nhaarman.mockitokotlin2.whenever
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.InternalCoroutinesApi
 import org.assertj.core.api.Assertions
 import org.junit.Before
@@ -70,7 +69,6 @@ class ReaderDiscoverDataProviderTest {
         )
     }
 
-    @ExperimentalCoroutinesApi
     @Test
     fun `when refreshCards is requested started gets posted on comm channel`() = test {
         whenever(fetchDiscoverCardsUseCase.fetch(REQUEST_FIRST_PAGE)).thenReturn(Started(REQUEST_FIRST_PAGE))
@@ -83,7 +81,6 @@ class ReaderDiscoverDataProviderTest {
                 .isEqualTo(Started(REQUEST_FIRST_PAGE))
     }
 
-    @ExperimentalCoroutinesApi
     @Test
     fun `when fetch request fails then failure gets posted to comm channel`() = test {
         // Arrange
@@ -97,7 +94,6 @@ class ReaderDiscoverDataProviderTest {
                 .isEqualTo(RemoteRequestFailure(REQUEST_FIRST_PAGE))
     }
 
-    @ExperimentalCoroutinesApi
     @Test
     fun `when fetch request succeeds success gets posted to comm channel`() = test {
         // Arrange
@@ -111,7 +107,6 @@ class ReaderDiscoverDataProviderTest {
                 .isEqualTo(Success(REQUEST_FIRST_PAGE))
     }
 
-    @ExperimentalCoroutinesApi
     @Test
     fun `when fetch request unchanged success gets posted to comm channel`() = test {
         // Arrange
@@ -125,7 +120,6 @@ class ReaderDiscoverDataProviderTest {
                 .isEqualTo(Success(REQUEST_FIRST_PAGE))
     }
 
-    @ExperimentalCoroutinesApi
     @Test
     fun `on cards updated has new the data gets posted to discover feed`() = test {
         // Arrange
@@ -143,7 +137,6 @@ class ReaderDiscoverDataProviderTest {
                 .isEqualTo(NUMBER_OF_ITEMS)
     }
 
-    @ExperimentalCoroutinesApi
     @Test
     fun `when loadMoreRequest in progress another started not posted to comm channel`() = test {
         whenever(fetchDiscoverCardsUseCase.fetch(REQUEST_MORE)).thenReturn(Started(REQUEST_MORE))
@@ -168,7 +161,6 @@ class ReaderDiscoverDataProviderTest {
     }
 
     // The following test the loadData(), which is kicked off when discoverFeed obtains observers
-    @ExperimentalCoroutinesApi
     @Test
     fun `when loadData with refresh request is started and posted to comm channel`() = test {
         whenever(fetchDiscoverCardsUseCase.fetch(REQUEST_FIRST_PAGE)).thenReturn(Started(REQUEST_FIRST_PAGE))
@@ -182,7 +174,6 @@ class ReaderDiscoverDataProviderTest {
         Assertions.assertThat(requireNotNull(started)).isEqualTo(Started(REQUEST_FIRST_PAGE))
     }
 
-    @ExperimentalCoroutinesApi
     @Test
     fun `when loadData without refresh no start message posted to comm channel`() = test {
         whenever(getDiscoverCardsUseCase.get()).thenReturn(createDummyReaderCardsList())
@@ -195,7 +186,6 @@ class ReaderDiscoverDataProviderTest {
         Assertions.assertThat(started).isNull()
     }
 
-    @ExperimentalCoroutinesApi
     @Test
     fun `when loadData with forceReload true data posted to discover channel`() = test {
         whenever(getDiscoverCardsUseCase.get()).thenReturn(createDummyReaderCardsList())
@@ -211,7 +201,6 @@ class ReaderDiscoverDataProviderTest {
         Assertions.assertThat(data).isNotNull
     }
 
-    @ExperimentalCoroutinesApi
     @Test
     fun `when loadData with existsInMemory data posted to discover feed`() = test {
         val discoverFeedObserver = Observer<ReaderDiscoverCards> { }
@@ -240,7 +229,6 @@ class ReaderDiscoverDataProviderTest {
         Assertions.assertThat(data?.cards?.size).isEqualTo(NUMBER_OF_ITEMS)
     }
 
-    @ExperimentalCoroutinesApi
     @Test
     fun `when followed tags change the discover feed gets refreshed`() = test {
         // Act

diff --git a/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/StatsViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/StatsViewModelTest.kt
@@ -5,7 +5,6 @@ import androidx.lifecycle.MutableLiveData
 import com.nhaarman.mockitokotlin2.verify
 import com.nhaarman.mockitokotlin2.whenever
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.Before
 import org.junit.Test
@@ -48,7 +47,6 @@ class StatsViewModelTest : BaseUnitTest() {
     private lateinit var viewModel: StatsViewModel
     private val _liveSelectedSection = MutableLiveData<StatsSection>()
     private val liveSelectedSection: LiveData<StatsSection> = _liveSelectedSection
-    @ExperimentalCoroutinesApi
     @Before
     fun setUp() {
         whenever(baseListUseCase.snackbarMessage).thenReturn(MutableLiveData())

diff --git a/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/UiModelMapperTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/UiModelMapperTest.kt
@@ -1,6 +1,5 @@
 package org.wordpress.android.ui.stats.refresh.lists
 
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.Before
 import org.junit.Test
@@ -18,7 +17,6 @@ import org.wordpress.android.util.NetworkUtilsWrapper
 class UiModelMapperTest : BaseUnitTest() {
     @Mock lateinit var networkUtilsWrapper: NetworkUtilsWrapper
     private lateinit var mapper: UiModelMapper
-    @ExperimentalCoroutinesApi
     @Before
     fun setUp() {
         mapper = UiModelMapper(networkUtilsWrapper)

diff --git a/build.gradle b/build.gradle
@@ -1,8 +1,9 @@
 buildscript {
-    ext.kotlinVersion = '1.3.61'
-    ext.serializationVersion = '0.14.0'
+    ext.kotlinVersion = '1.4.10'
+    ext.serializationVersion = '1.0-M1-1.4.0-rc'
     ext.navComponentVersion = '2.0.0'
-    ext.kotlin_coroutines_version = '1.3.3'
+    ext.kotlin_coroutines_version = '1.3.9'
+    ext.coroutinesVersion = '1.3.9'
     ext.kotlin_ktx_version = '1.2.0'
     ext.androidx_work_version = "2.0.1"
     ext.buildGutenbergMobileJSBundle = 1
@@ -125,7 +126,7 @@ ext {
     minSdkVersion = 21
     targetSdkVersion = 29
 
-    coroutinesVersion = '1.3.3'
+    coroutinesVersion = '1.3.9'
     androidxWorkVersion = "2.0.1"
 
     daggerVersion = '2.29.1'

diff --git a/libs/WordPressAnnotations/build.gradle b/libs/WordPressAnnotations/build.gradle
@@ -1,9 +1,9 @@
 apply plugin: 'kotlin'
 
 dependencies {
-    ext.kotlinVersion = '1.3.61'
+    ext.kotlinVersion = '1.4.10'
 
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
 }
 
 sourceCompatibility = "7"

diff --git a/libs/stories-android b/libs/stories-android
diff --git a/libs/utils/WordPressUtils/build.gradle b/libs/utils/WordPressUtils/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlinVersion = '1.3.61'
+    ext.kotlinVersion = '1.4.10'
     ext.kotlin_ktx_version = '1.2.0'
 
     repositories {
+1 −1		app/build.gradle
+3 −3		build.gradle
+1 −1		photoeditor/build.gradle
+1 −1		photoeditor/src/main/java/com/automattic/photoeditor/camera/ErrorDialog.kt
+6 −6		photoeditor/src/main/java/com/automattic/photoeditor/views/added/AddedView.kt
+1 −1		stories/build.gradle
+0 −17		stories/src/main/java/com/wordpress/stories/compose/ComposeLoopFrameActivity.kt
+3 −9		stories/src/main/java/com/wordpress/stories/compose/FrameSaveErrorDialog.kt
+15 −15		stories/src/main/java/com/wordpress/stories/compose/story/StoryFrameItem.kt
+0 −6		stories/src/main/java/com/wordpress/stories/compose/story/StoryFrameSelectorAdapter.kt
+0 −11		stories/src/main/java/com/wordpress/stories/compose/story/StoryFrameSelectorFragment.kt
+12 −16		stories/src/main/java/com/wordpress/stories/compose/story/StorySerializerUtils.kt
+0 −21		stories/src/main/java/com/wordpress/stories/compose/story/StoryViewModel.kt