Merge branch 'main' into kyay10/contract-fixes

arrow-libs/core/arrow-autoclose/build.gradle.kts

@@ -51,8 +51,3 @@ kotlin {
     (project.rootProject.properties["kotlin_api_version"] as? String)?.also { apiVersion = KotlinVersion.fromVersion(it) }
   }
 }
-
-// enables context receivers for Jvm Tests
-tasks.named<KotlinCompile>("compileTestKotlinJvm") {
-  compilerOptions.freeCompilerArgs.add("-Xcontext-receivers")
-}

arrow-libs/core/arrow-autoclose/src/commonMain/kotlin/arrow/AutoCloseScope.kt

@@ -52,11 +52,10 @@ import kotlin.coroutines.cancellation.CancellationException
  * So both [AutoCloseScope], and `ResourceScope` behave correctly when encountering cancellation, by closing the source,
  * but `ResourceScope` allows inspecting _complete_, _failure_, **and** _cancellation_ in the finalizer.
  *
- * This DSL works very well with Kotlin's experimental feature context receivers, soon called context parameters.
- * We can write the same code from above as a function:
+ * We can write the same code from above as a function by adding the scope as receiver:
+ *
  * ```kotlin
- * context(AutoCloseScope)
- * fun copyFiles(input: String, output: String) {
+ * fun AutoCloseScope.copyFiles(input: String, output: String) {
  *   val scanner = install(Scanner(input))
  *   val printer = install(Printer(output))
  *   for(line in scanner) {

arrow-libs/core/arrow-autoclose/src/jvmTest/kotlin/examples/example-autocloseable-02.kt

@@ -15,8 +15,7 @@ public class Printer(private val path: String) : AutoCloseable {
   override fun close(): Unit = Unit
 }
 
-context(AutoCloseScope)
-fun copyFiles(input: String, output: String) {
+fun AutoCloseScope.copyFiles(input: String, output: String) {
   val scanner = install(Scanner(input))
   val printer = install(Printer(output))
   for(line in scanner) {

arrow-libs/core/arrow-cache4k/build.gradle.kts

@@ -83,8 +83,3 @@ tasks.named<Jar>("jvmJar").configure {
     attributes["Automatic-Module-Name"] = "arrow.cache4k"
   }
 }
-
-// enables context receivers for Jvm Tests
-tasks.named<KotlinCompile>("compileTestKotlinJvm") {
-  compilerOptions.freeCompilerArgs.add("-Xcontext-receivers")
-}

arrow-libs/core/arrow-core/build.gradle.kts

@@ -79,11 +79,6 @@ kotlin {
   }
 }
 
-// enables context receivers for Jvm Tests
-tasks.named<KotlinCompile>("compileTestKotlinJvm") {
-  compilerOptions.freeCompilerArgs.add("-Xcontext-receivers")
-}
-
 tasks.withType<Test>().configureEach {
   useJUnitPlatform()
 }

arrow-libs/core/arrow-core/src/commonMain/kotlin/arrow/core/raise/Effect.kt

@@ -164,17 +164,17 @@ import kotlin.jvm.JvmName
  * ```
  * <!--- KNIT example-raise-03.kt -->
  *
- * Adding your own syntax to `Raise<R>` is not advised, yet, but will be easy once "Multiple Receivers" become available.
+ * Adding your own syntax to `Raise<R>` is not advised, yet, but will be easy once context parameters become available.
  *
  * ```
- * context(Raise<R>)
+ * context(_: Raise<R>)
  * suspend fun <R, A> Either<R, A>.bind(): A =
  *   when (this) {
  *     is Either.Left -> raise(value)
  *     is Either.Right -> value
  *   }
  *
- * context(Raise<None>)
+ * context(_: Raise<None>)
  * fun <A> Option<A>.bind(): A =
  *   fold({ raise(it) }, ::identity)
  * ```

arrow-libs/core/arrow-core/src/commonMain/kotlin/arrow/core/raise/Raise.kt

@@ -169,8 +169,7 @@ public interface Raise<in Error> {
    *
    * data class Config(val mode: Int, val role: String, val serviceType: ServiceType)
    *
-   * context(Raise<String>)
-   * fun readConfig(): Config {
+   * fun Raise<String>.readConfig(): Config {
    *     val mode = ensureNotNull(readln().toIntOrNull()) {
    *         "Mode should be a valid integer"
    *     }
@@ -531,8 +530,7 @@ public inline fun <reified T : Throwable, A> catch(block: () -> A, catch: (t: T)
  *     object ContainsInvalidChars : CountryCodeError
  * }
  *
- * context(Raise<CountryCodeError>)
- * fun countryCode(rawCode: String): CountryCode {
+ * fun Raise<CountryCodeError>.countryCode(rawCode: String): CountryCode {
  *     ensure(rawCode.length == 2) { CountryCodeError.InvalidLength(rawCode.length) }
  *     ensure(rawCode.any { !it.isLetter() }) { CountryCodeError.ContainsInvalidChars }
  *     return CountryCode(rawCode)
@@ -601,8 +599,7 @@ public inline fun <Error> Raise<Error>.ensure(condition: Boolean, raise: () -> E
  *     object NullValue : NameError
  * }
  *
- * context(Raise<NameError>)
- * fun fullName(name: String?): FullName {
+ * fun Raise<NameError>.fullName(name: String?): FullName {
  *     val nonNullName = ensureNotNull(name) { NameError.NullValue }
  *     return FullName(nonNullName)
  * }

arrow-libs/core/arrow-core/src/jvmTest/kotlin/arrow/core/raise/EffectUsage.kt

@@ -9,16 +9,13 @@ sealed interface OtherError : MyError {
   object Actual : OtherError
 }
 
-context(Raise<SubError>)
-  suspend fun subprogram(): Unit =
+suspend fun Raise<SubError>.subprogram(): Unit =
   println("Hello SubProgram!")
 
-context(Raise<OtherError>)
-  suspend fun otherprogram(): Unit =
+suspend fun Raise<OtherError>.otherprogram(): Unit =
   println("Hello OtherProgram!")
 
-context(Raise<OtherError>)
-  suspend fun fail(): MyResponse =
+suspend fun Raise<OtherError>.fail(): MyResponse =
   raise(OtherError.Actual)
 
 fun main() =
@@ -38,12 +35,10 @@ object EmptyResponse : MyResponse
 data class ErrorResponse(val error: Throwable) : MyResponse
 data class BodyResponse(val body: String) : MyResponse
 
-context(Raise<SubError>)
-  suspend fun respondWithBody(): BodyResponse =
+suspend fun Raise<SubError>.respondWithBody(): BodyResponse =
   BodyResponse("Hello Program!")
 
-context(Raise<OtherError>)
-  suspend fun attemptOrError(): MyResponse =
+suspend fun Raise<OtherError>.attemptOrError(): MyResponse =
   ErrorResponse(RuntimeException("Oh no!"))
 
 fun respond(): Effect<MyError, MyResponse> =

arrow-libs/optics/arrow-optics-ksp-plugin/src/main/kotlin/arrow/optics/plugin/OpticsProcessor.kt

@@ -15,6 +15,7 @@ import com.google.devtools.ksp.processing.Resolver
 import com.google.devtools.ksp.processing.SymbolProcessor
 import com.google.devtools.ksp.symbol.KSAnnotated
 import com.google.devtools.ksp.symbol.KSClassDeclaration
+import com.google.devtools.ksp.validate
 
 class OpticsProcessor(
   private val codegen: CodeGenerator,
@@ -23,15 +24,16 @@ class OpticsProcessor(
 ) :
   SymbolProcessor {
   override fun process(resolver: Resolver): List<KSAnnotated> {
-    resolver
+    val (resolved, deferred) = resolver
       .getSymbolsWithAnnotation("arrow.optics.optics")
       .filterIsInstance<KSClassDeclaration>()
-      .forEach(::processClass)
+      .partition { it.validate() }
+    resolved.forEach(::processClass)
 
-    // the docs say that [process] should return
-    // "deferred symbols that the processor can't process"
-    // and in theory we have none
-    return emptyList()
+    // If types used by the annotated class are by other processors,
+    // such class will fail the validation. In that case, we need to
+    // defer the code generation for the class to the next round
+    return deferred
   }
 
   private fun processClass(klass: KSClassDeclaration) {

gradle/libs.versions.toml

@@ -1,16 +1,16 @@
 [versions]
-animalSniffer = "1.7.1"
+animalSniffer = "1.7.2"
 arrowGradleConfig = "0.12.0-rc.24"
 coroutines = "1.9.0"
 classgraph = "4.8.179"
 dokka = "1.9.20"
 kotest = "6.0.0.M1"
 kover = "0.8.3"
-kotlin = "2.1.0-RC"
+kotlin = "2.1.0-RC2"
 kotlinBinaryCompatibilityValidator = "0.16.3"
 kotlinCompileTesting = "0.6.0"
 knit = "0.5.0"
-kspVersion = "2.1.0-RC-1.0.27"
+kspVersion = "2.1.0-RC2-1.0.28"
 kotlinxSerialization = "1.7.3"
 mockWebServer = "4.12.0"
 retrofit = "2.11.0"

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME