Merge pull request #717 from square/sedwards/update-kotlin-agp

Update AGP versions, Gradle Versions, and OptIn Notation

Author: steve-the-edwards

build.gradle.kts

@@ -55,7 +55,7 @@ subprojects {
 
       // Don't panic, all this does is allow us to use the @OptIn meta-annotation.
       // to define our own experiments.
-      freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"
+      freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
     }
   }
 

gradle/libs.versions.toml

@@ -1,8 +1,6 @@
 [versions]
 
-# Included for convenience to turn on when benchmarking.
-#androidTools = "7.3.0-alpha03"
-androidTools = "7.0.0"
+androidTools = "7.1.3"
 
 compileSdk = "31"
 minSdkVersion = "21"
@@ -11,8 +9,6 @@ targetSdk = "30"
 androidx-activity = "1.3.0"
 androidx-appcompat = "1.3.1"
 androidx-benchmark = "1.1.0-beta04"
-# Included for convenience to turn on when benchmarking.
-#androidx-benchmark = "1.1.0-SNAPSHOT"
 androidx-compose = "1.1.0-rc01"
 androidx-compose-compiler = "1.1.0-rc02"
 androidx-constraintlayout = "2.1.2"
@@ -22,8 +18,6 @@ androidx-lifecycle = "2.4.0"
 androidx-navigation = "2.4.0-alpha09"
 androidx-paging = "3.0.1"
 androidx-profileinstaller = "1.2.0-alpha02"
-# Included for convenience to turn on when benchmarking.
-#androidx-profileinstaller = "1.2.0-SNAPSHOT"
 androidx-recyclerview = "1.2.1"
 androidx-room = "2.4.0-alpha04"
 androidx-savedstate = "1.1.0"

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

samples/tutorial/build.gradle

@@ -8,7 +8,7 @@ buildscript {
 
     deps = [
         activityktx: 'androidx.activity:activity-ktx:1.3.0',
-        agp: "com.android.tools.build:gradle:7.0.0",
+        agp: "com.android.tools.build:gradle:7.1.3",
         appcompat: 'androidx.appcompat:appcompat:1.3.1',
         constraintlayout: 'androidx.constraintlayout:constraintlayout:2.0.1',
         kotlin: [
@@ -51,7 +51,7 @@ subprojects {
 
   tasks.withType(KotlinCompile).configureEach {
     kotlinOptions {
-      freeCompilerArgs += '-Xopt-in=kotlin.RequiresOptIn'
+      freeCompilerArgs += '-opt-in=kotlin.RequiresOptIn'
     }
   }
 }

samples/tutorial/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

trace-encoder/src/main/java/com/squareup/tracing/TraceEncoder.kt

@@ -4,6 +4,7 @@ import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers.IO
+import kotlinx.coroutines.ObsoleteCoroutinesApi
 import kotlinx.coroutines.channels.Channel.Factory.UNLIMITED
 import kotlinx.coroutines.channels.ClosedSendChannelException
 import kotlinx.coroutines.channels.SendChannel
@@ -27,6 +28,7 @@ import kotlin.time.TimeSource
  * @param sinkProvider Returns the [BufferedSink] to use to write trace events to. Called on a
  * background thread.
  */
+@OptIn(ObsoleteCoroutinesApi::class)
 public class TraceEncoder(
   scope: CoroutineScope,
   private val start: TimeMark = TraceEncoderTimeMark,
@@ -37,7 +39,6 @@ public class TraceEncoder(
   private val processIdCounter = AtomicInteger(0)
   private val threadIdCounter = AtomicInteger(0)
 
-  @Suppress("EXPERIMENTAL_API_USAGE")
   private val events: SendChannel<List<ChromeTraceEvent>> =
     scope.actor(ioDispatcher, capacity = UNLIMITED) {
       sinkProvider().use { sink ->

workflow-testing/src/main/java/com/squareup/workflow1/testing/WorkerTester.kt

@@ -1,10 +1,12 @@
-@file:Suppress("EXPERIMENTAL_API_USAGE")
+@file:OptIn(FlowPreview::class, ExperimentalCoroutinesApi::class)
 
 package com.squareup.workflow1.testing
 
 import com.squareup.workflow1.Worker
 import com.squareup.workflow1.testing.WorkflowTestRuntime.Companion.DEFAULT_TIMEOUT_MS
 import kotlinx.coroutines.Dispatchers.Unconfined
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.cancelChildren
 import kotlinx.coroutines.channels.ReceiveChannel
 import kotlinx.coroutines.flow.produceIn

workflow-testing/src/main/java/com/squareup/workflow1/testing/WorkflowTestRuntime.kt

@@ -1,4 +1,4 @@
-@file:Suppress("EXPERIMENTAL_API_USAGE")
+@file:OptIn(ExperimentalCoroutinesApi::class)
 
 package com.squareup.workflow1.testing
 
@@ -19,6 +19,7 @@ import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineExceptionHandler
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers.Unconfined
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.NonCancellable
 import kotlinx.coroutines.cancel

workflow-ui/compose-tooling/build.gradle.kts

@@ -26,7 +26,7 @@ tasks.withType<KotlinCompile> {
   kotlinOptions {
     @Suppress("SuspiciousCollectionReassignment")
     freeCompilerArgs += listOf(
-      "-Xopt-in=kotlin.RequiresOptIn"
+      "-opt-in=kotlin.RequiresOptIn"
     )
   }
 }

workflow-ui/compose/build.gradle.kts

@@ -26,7 +26,7 @@ tasks.withType<KotlinCompile> {
   kotlinOptions {
     @Suppress("SuspiciousCollectionReassignment")
     freeCompilerArgs += listOf(
-      "-Xopt-in=kotlin.RequiresOptIn"
+      "-opt-in=kotlin.RequiresOptIn"
     )
   }
 }