Kotlin 1.3 - Step 2: Fix warnings.

Closes #35.

kotlin/legacy/legacy-workflow-core/build.gradle

@@ -20,8 +20,6 @@ apply plugin: 'com.vanniktech.maven.publish'
 sourceCompatibility = JavaVersion.VERSION_1_7
 targetCompatibility = JavaVersion.VERSION_1_7
 
-kotlin.experimental.coroutines 'enable'
-
 dependencies {
   compileOnly deps.annotations.intellij
 

kotlin/legacy/legacy-workflow-core/src/main/java/com/squareup/workflow/legacy/CoroutineWorkflow.kt

@@ -13,6 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+@file:Suppress("EXPERIMENTAL_API_USAGE")
+
 package com.squareup.workflow.legacy
 
 import kotlinx.coroutines.CoroutineScope

kotlin/legacy/legacy-workflow-core/src/main/java/com/squareup/workflow/legacy/Reactor.kt

@@ -13,6 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+@file:Suppress("EXPERIMENTAL_API_USAGE")
+
 package com.squareup.workflow.legacy
 
 import kotlinx.coroutines.CancellationException

kotlin/legacy/legacy-workflow-core/src/main/java/com/squareup/workflow/legacy/WorkflowOperators.kt

@@ -13,6 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+@file:Suppress("EXPERIMENTAL_API_USAGE")
+
 package com.squareup.workflow.legacy
 
 import kotlinx.coroutines.CoroutineScope
@@ -113,6 +115,7 @@ fun <S : Any, E : Any, O1 : Any, O2 : Any> Workflow<S, E, O1>.mapResult(
   // Propagate cancellation upstream.
   transformedResult.invokeOnCompletion { cause ->
     if (cause != null) {
+      @Suppress("DEPRECATION")
       this@mapResult.cancel(cause)
     }
   }

kotlin/legacy/legacy-workflow-core/src/main/java/com/squareup/workflow/legacy/WorkflowPool.kt

@@ -13,6 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+@file:Suppress("EXPERIMENTAL_API_USAGE")
+
 package com.squareup.workflow.legacy
 
 import com.squareup.workflow.legacy.WorkflowPool.Handle

kotlin/legacy/legacy-workflow-core/src/test/java/com/squareup/workflow/legacy/CoroutineWorkflowTest.kt

@@ -13,6 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+@file:Suppress("EXPERIMENTAL_API_USAGE")
+
 package com.squareup.workflow.legacy
 
 import kotlinx.coroutines.CancellationException
@@ -172,6 +174,23 @@ class CoroutineWorkflowTest : CoroutineScope {
   }
 
   @Test fun `block gets original cancellation reason`() {
+    lateinit var cancelReason: Throwable
+    val workflow = workflow<Nothing, Nothing, Nothing> { _, _ ->
+      suspendCancellableCoroutine<Nothing> { continuation ->
+        continuation.invokeOnCancellation {
+          cancelReason = it!!
+        }
+      }
+    }
+    testContext.triggerActions()
+    workflow.cancel()
+
+    assertTrue(cancelReason is CancellationException)
+    assertNull(cancelReason.cause)
+  }
+
+  @Suppress("DEPRECATION")
+  @Test fun `block gets original cancellation reason - deprecated cancel`() {
     lateinit var cancelReason: Throwable
     val workflow = workflow<Nothing, Nothing, Nothing> { _, _ ->
       suspendCancellableCoroutine<Nothing> { continuation ->

kotlin/legacy/legacy-workflow-core/src/test/java/com/squareup/workflow/legacy/ReactorAsWorkflowIntegrationTest.kt

@@ -13,6 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+@file:Suppress("EXPERIMENTAL_API_USAGE")
+
 package com.squareup.workflow.legacy
 
 import com.squareup.workflow.legacy.TestState.FirstState

kotlin/legacy/legacy-workflow-core/src/test/java/com/squareup/workflow/legacy/WorkerTest.kt

@@ -13,6 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+@file:Suppress("EXPERIMENTAL_API_USAGE")
+
 package com.squareup.workflow.legacy
 
 import kotlinx.coroutines.CancellationException

kotlin/legacy/legacy-workflow-core/src/test/java/com/squareup/workflow/legacy/WorkflowOperatorsTest.kt

@@ -13,6 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+@file:Suppress("EXPERIMENTAL_API_USAGE")
+
 package com.squareup.workflow.legacy
 
 import kotlinx.coroutines.CancellationException
@@ -79,6 +81,7 @@ class WorkflowOperatorsTest {
       it.toString()
     }
 
+    @Suppress("DEPRECATION")
     withAdaptedEvents.cancel(ExpectedException())
 
     assertTrue(sourceCancellation is CancellationException)
@@ -157,6 +160,7 @@ class WorkflowOperatorsTest {
     val withMappedStates = source.mapState { it }
 
     assertNull(sourceCancellation)
+    @Suppress("DEPRECATION")
     withMappedStates.cancel(ExpectedException())
     assertTrue(sourceCancellation is CancellationException)
   }
@@ -314,7 +318,10 @@ class WorkflowOperatorsTest {
       state.send(42)
     }
     val withMappedStates: Workflow<Int, Unit, Unit> = source.switchMapState {
-      Channel<Int>().apply { cancel(ExpectedException()) }
+      Channel<Int>().apply {
+        @Suppress("DEPRECATION")
+        cancel(ExpectedException())
+      }
     }
 
     withMappedStates.openSubscriptionToState()
@@ -361,6 +368,7 @@ class WorkflowOperatorsTest {
           withMappedStates.sendEvent(Unit)
 
           assertFalse(transformedChannel.isClosedForSend)
+          @Suppress("DEPRECATION")
           this.cancel(ExpectedException())
           assertTrue(transformedChannel.isClosedForSend)
         }
@@ -378,6 +386,7 @@ class WorkflowOperatorsTest {
     val withMappedStates = source.switchMapState { produce { send(it) } }
 
     assertNull(sourceCancellation)
+    @Suppress("DEPRECATION")
     withMappedStates.cancel(ExpectedException())
     assertTrue(sourceCancellation is CancellationException)
   }
@@ -436,6 +445,7 @@ class WorkflowOperatorsTest {
     val withMappedResult = source.mapResult { it }
 
     assertNull(sourceCancellation)
+    @Suppress("DEPRECATION")
     withMappedResult.cancel(ExpectedException())
     assertTrue(sourceCancellation is CancellationException)
   }

kotlin/legacy/legacy-workflow-core/src/test/java/com/squareup/workflow/legacy/WorkflowPoolTest.kt

@@ -13,6 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+@file:Suppress("EXPERIMENTAL_API_USAGE")
+
 package com.squareup.workflow.legacy
 
 import kotlinx.coroutines.CancellationException

kotlin/legacy/legacy-workflow-rx2/build.gradle

@@ -20,8 +20,6 @@ apply plugin: 'com.vanniktech.maven.publish'
 sourceCompatibility = JavaVersion.VERSION_1_7
 targetCompatibility = JavaVersion.VERSION_1_7
 
-kotlin.experimental.coroutines 'enable'
-
 dependencies {
   compileOnly deps.annotations.intellij
   compileOnly deps.annotations.androidSupport

kotlin/legacy/legacy-workflow-rx2/src/main/java/com/squareup/workflow/legacy/rx2/EventSelectBuilder.kt

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@file:Suppress("DeprecatedCallableAddReplaceWith")
+@file:Suppress("DeprecatedCallableAddReplaceWith", "EXPERIMENTAL_API_USAGE")
 
 package com.squareup.workflow.legacy.rx2
 

kotlin/legacy/legacy-workflow-rx2/src/main/java/com/squareup/workflow/legacy/rx2/WorkflowOperators.kt

@@ -13,6 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+@file:Suppress("EXPERIMENTAL_API_USAGE")
+
 package com.squareup.workflow.legacy.rx2
 
 import com.squareup.workflow.legacy.Workflow

kotlin/legacy/legacy-workflow-rx2/src/main/java/com/squareup/workflow/legacy/rx2/Workflows.kt

@@ -13,6 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+@file:Suppress("EXPERIMENTAL_API_USAGE")
+
 package com.squareup.workflow.legacy.rx2
 
 import com.squareup.workflow.legacy.Workflow

kotlin/legacy/legacy-workflow-rx2/src/test/java/com/squareup/workflow/legacy/rx2/CoroutineEventChannelTest.kt

@@ -13,6 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+@file:Suppress("EXPERIMENTAL_API_USAGE")
+
 package com.squareup.workflow.legacy.rx2
 
 import com.squareup.workflow.legacy.Finished

kotlin/viewregistry/build.gradle

@@ -20,8 +20,6 @@ apply plugin: 'com.vanniktech.maven.publish'
 sourceCompatibility = JavaVersion.VERSION_1_7
 targetCompatibility = JavaVersion.VERSION_1_7
 
-kotlin.experimental.coroutines 'enable'
-
 dependencies {
   api deps.kotlin.stdLib.jdk6
   api deps.okio

kotlin/workflow-core/build.gradle

@@ -20,8 +20,6 @@ apply plugin: 'com.vanniktech.maven.publish'
 sourceCompatibility = JavaVersion.VERSION_1_7
 targetCompatibility = JavaVersion.VERSION_1_7
 
-kotlin.experimental.coroutines 'enable'
-
 dependencies {
   compileOnly deps.annotations.intellij
 

kotlin/workflow-core/src/main/java/com/squareup/workflow/Snapshot.kt

@@ -13,6 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+@file:Suppress("EXPERIMENTAL_API_USAGE")
+
 package com.squareup.workflow
 
 import okio.Buffer

kotlin/workflow-core/src/main/java/com/squareup/workflow/WorkflowContext.kt

@@ -13,6 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+@file:Suppress("EXPERIMENTAL_API_USAGE")
+
 package com.squareup.workflow
 
 import com.squareup.workflow.ChannelUpdate.Value

kotlin/workflow-host/build.gradle

@@ -20,8 +20,6 @@ apply plugin: 'com.vanniktech.maven.publish'
 sourceCompatibility = JavaVersion.VERSION_1_7
 targetCompatibility = JavaVersion.VERSION_1_7
 
-kotlin.experimental.coroutines 'enable'
-
 dependencies {
   compileOnly deps.annotations.intellij
 

kotlin/workflow-host/src/main/java/com/squareup/workflow/WorkflowHost.kt

@@ -13,6 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+@file:Suppress("EXPERIMENTAL_API_USAGE")
+
 package com.squareup.workflow
 
 import com.squareup.workflow.WorkflowHost.Factory
@@ -139,6 +141,7 @@ internal fun <I : Any, S : Any, O : Any, R : Any> WorkflowNode<I, S, O, R>.start
   } catch (e: Throwable) {
     // For some reason the exception gets masked if we don't explicitly pass it to cancel the
     // producer coroutine ourselves here.
+    @Suppress("DEPRECATION")
     coroutineContext.cancel(e)
     throw e
   } finally {

kotlin/workflow-host/src/main/java/com/squareup/workflow/internal/ChannelUpdates.kt

@@ -13,6 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+@file:Suppress("EXPERIMENTAL_API_USAGE")
+
 package com.squareup.workflow.internal
 
 import com.squareup.workflow.ChannelUpdate

kotlin/workflow-host/src/test/java/com/squareup/workflow/internal/ChannelUpdatesTest.kt

@@ -13,6 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+@file:Suppress("EXPERIMENTAL_API_USAGE")
+
 package com.squareup.workflow.internal
 
 import com.squareup.workflow.ChannelUpdate
@@ -80,6 +82,7 @@ class ChannelUpdatesTest {
 
   @Test fun handlesError() {
     val channel = Channel<String>()
+    @Suppress("DEPRECATION")
     channel.cancel(ExpectedException())
 
     assertFailsWith<ExpectedException> {

kotlin/workflow-host/src/test/java/com/squareup/workflow/internal/RealWorkflowContextTest.kt

@@ -13,6 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+@file:Suppress("EXPERIMENTAL_API_USAGE")
+
 package com.squareup.workflow.internal
 
 import com.squareup.workflow.Snapshot

kotlin/workflow-host/src/test/java/com/squareup/workflow/internal/SubtreeManagerTest.kt

@@ -13,6 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+@file:Suppress("EXPERIMENTAL_API_USAGE")
+
 package com.squareup.workflow.internal
 
 import com.squareup.workflow.Snapshot

kotlin/workflow-host/src/test/java/com/squareup/workflow/internal/WorkflowNodeTest.kt

@@ -13,6 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+@file:Suppress("EXPERIMENTAL_API_USAGE")
+
 package com.squareup.workflow.internal
 
 import com.squareup.workflow.Snapshot

kotlin/workflow-rx2/build.gradle

@@ -20,8 +20,6 @@ apply plugin: 'com.vanniktech.maven.publish'
 sourceCompatibility = JavaVersion.VERSION_1_7
 targetCompatibility = JavaVersion.VERSION_1_7
 
-kotlin.experimental.coroutines 'enable'
-
 dependencies {
   compileOnly deps.annotations.intellij
 

kotlin/workflow-rx2/src/main/java/com/squareup/workflow/rx2/WorkflowContexts.kt

@@ -13,6 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+@file:Suppress("EXPERIMENTAL_API_USAGE")
+
 package com.squareup.workflow.rx2
 
 import com.squareup.workflow.ChannelUpdate

kotlin/workflow-testing/build.gradle

@@ -20,8 +20,6 @@ apply plugin: 'com.vanniktech.maven.publish'
 sourceCompatibility = JavaVersion.VERSION_1_7
 targetCompatibility = JavaVersion.VERSION_1_7
 
-kotlin.experimental.coroutines 'enable'
-
 dependencies {
   compileOnly deps.annotations.intellij
 

kotlin/workflow-testing/src/main/java/com/squareup/workflow/testing/WorkflowTester.kt

@@ -13,6 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+@file:Suppress("EXPERIMENTAL_API_USAGE")
+
 package com.squareup.workflow.testing
 
 import com.squareup.workflow.Snapshot

kotlin/workflow-testing/src/main/java/com/squareup/workflow/testing/WorkflowTesting.kt

@@ -13,6 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+@file:Suppress("EXPERIMENTAL_API_USAGE")
+
 package com.squareup.workflow.testing
 
 import com.squareup.workflow.Snapshot
@@ -102,6 +104,7 @@ private fun <O : Any, R : Any> test(
     throw e
   } finally {
     if (error != null) {
+      @Suppress("DEPRECATION")
       val cancelled = context.cancel(error)
       if (!cancelled) {
         val cancellationCause = context[Job]!!.getCancellationException()