Merge remote-tracking branch 'origin/main' into arrow-2

.github/workflows/githubpages.yaml

@@ -13,7 +13,7 @@ jobs:
     timeout-minutes: 20
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 

.github/workflows/publish.yml

@@ -29,7 +29,7 @@ jobs:
     timeout-minutes: 90
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -42,7 +42,7 @@ jobs:
       - name: assemble
         uses: gradle/gradle-build-action@v2
         with:
-          arguments:  assemble -Psemver.stage=snapshot -Psemver.scope=major
+          arguments: assemble -Pversion=${{ inputs.version }}
 
       - name: Upload reports
         if: failure()
@@ -54,4 +54,4 @@ jobs:
       - name: Publish next major SNAPSHOT version
         uses: gradle/gradle-build-action@v2
         with:
-          arguments: -Psemver.stage=snapshot -Psemver.scope=major publishToSonatype
+          arguments: -Pversion=${{ inputs.version }}  publishToSonatype closeSonatypeStagingRepository

.github/workflows/pull_request.yml

@@ -15,7 +15,7 @@ jobs:
     timeout-minutes: 60
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -42,7 +42,7 @@ jobs:
     timeout-minutes: 60
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -69,7 +69,7 @@ jobs:
     timeout-minutes: 60
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -96,7 +96,7 @@ jobs:
     timeout-minutes: 60
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -123,7 +123,7 @@ jobs:
     timeout-minutes: 60
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -165,11 +165,8 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 60
 
-    env:
-      KOTLIN_OVERRIDE: 1.9.30-dev-1098
-
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -182,7 +179,7 @@ jobs:
       - name: jvmTest (K2 enabled)
         uses: gradle/gradle-build-action@v2
         with:
-          arguments: jvmTest -Pkotlin.experimental.tryK2=true
+          arguments: "jvmTest -Pkotlin_version=1.9.30-dev-2548 -Pkotlin_repo_url=https://maven.pkg.jetbrains.space/kotlin/p/kotlin/bootstrap -Pkotlin_language_version=2.0"
 
       - name: Upload reports
         if: failure()
@@ -196,7 +193,7 @@ jobs:
     timeout-minutes: 60
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -228,7 +225,7 @@ jobs:
     timeout-minutes: 60
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -255,7 +252,7 @@ jobs:
     timeout-minutes: 30
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -271,7 +268,7 @@ jobs:
           arguments: apiDump
 
       - name: "Commit new API files"
-        uses: stefanzweifel/git-auto-commit-action@v4
+        uses: stefanzweifel/git-auto-commit-action@v5
         with:
           commit_message: Update API files
           file_pattern: arrow-libs/**/api/*.api
@@ -281,7 +278,7 @@ jobs:
     timeout-minutes: 60
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -297,7 +294,7 @@ jobs:
           arguments: spotlessApply
 
       - name: "Commit newly formatted files"
-        uses: stefanzweifel/git-auto-commit-action@v4
+        uses: stefanzweifel/git-auto-commit-action@v5
         with:
           commit_message: Apply
           file_pattern: arrow-libs/**/*.kt

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

@@ -1,5 +1,8 @@
 @file:Suppress("DSL_SCOPE_VIOLATION")
 
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
+
 plugins {
   id(libs.plugins.kotlin.multiplatform.get().pluginId)
   alias(libs.plugins.arrowGradleConfig.kotlin)
@@ -77,3 +80,9 @@ kotlin {
     }
   }
 }
+
+tasks.withType<KotlinCompile>().configureEach {
+  kotlinOptions {
+    freeCompilerArgs = freeCompilerArgs + "-Xexpect-actual-classes"
+  }
+}

arrow-libs/core/arrow-core/src/commonMain/kotlin/arrow/core/NonEmptyList.kt

@@ -199,14 +199,6 @@ public value class NonEmptyList<out A> @PublishedApi internal constructor(
   public override inline fun <B> mapIndexed(transform: (index: Int, A) -> B): NonEmptyList<B> =
     NonEmptyList(transform(0, head), tail.mapIndexed { ix, e -> transform(ix + 1, e) })
 
-  @Suppress("OVERRIDE_BY_INLINE")
-  public override inline fun <B> flatMap(transform: (A) -> NonEmptyCollection<B>): NonEmptyList<B> =
-    transform(head).toNonEmptyList() + tail.flatMap(transform)
-
-  @Suppress("OVERRIDE_BY_INLINE")
-  public override inline fun <K> distinctBy(selector: (A) -> K): NonEmptyList<A> =
-    all.distinctBy(selector).toNonEmptyListOrNull()!!
-
   public operator fun plus(l: NonEmptyList<@UnsafeVariance A>): NonEmptyList<A> =
     this + l.all
 

arrow-libs/core/arrow-core/src/commonMain/kotlin/arrow/core/NonEmptySet.kt

@@ -21,25 +21,6 @@ public value class NonEmptySet<out A> private constructor(
 
   override fun lastOrNull(): A = elements.last()
 
-  @Suppress("OVERRIDE_BY_INLINE")
-  public override inline fun <B> map(transform: (A) -> B): NonEmptyList<B> =
-    elements.map(transform).toNonEmptyListOrNull()!!
-
-  @Suppress("OVERRIDE_BY_INLINE")
-  public override inline fun <B> mapIndexed(transform: (index: Int, A) -> B): NonEmptyList<B> =
-    elements.mapIndexed(transform).toNonEmptyListOrNull()!!
-
-  @Suppress("OVERRIDE_BY_INLINE")
-  public override inline fun <B> flatMap(transform: (A) -> NonEmptyCollection<B>): NonEmptyList<B> =
-    elements.flatMap(transform).toNonEmptyListOrNull()!!
-
-  override fun distinct(): NonEmptyList<A> =
-    toNonEmptyList()
-
-  @Suppress("OVERRIDE_BY_INLINE")
-  public override inline fun <K> distinctBy(selector: (A) -> K): NonEmptyList<A> =
-    elements.distinctBy(selector).toNonEmptyListOrNull()!!
-
   override fun toString(): String = "NonEmptySet(${this.joinToString()})"
 
   @Suppress("RESERVED_MEMBER_INSIDE_VALUE_CLASS")

build.gradle.kts

@@ -4,6 +4,7 @@ import kotlinx.knit.KnitPluginExtension
 import org.jetbrains.dokka.gradle.DokkaMultiModuleTask
 import org.jetbrains.dokka.gradle.DokkaTaskPartial
 import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 buildscript {
   repositories {
@@ -21,7 +22,16 @@ allprojects {
   repositories {
     mavenCentral()
     maven(url = "https://oss.sonatype.org/content/repositories/snapshots/")
-    maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/bootstrap")
+    (project.rootProject.properties["kotlin_repo_url"] as? String)?.also { maven(it) }
+  }
+
+  tasks {
+    withType<KotlinCompile> {
+      kotlinOptions {
+        (project.rootProject.properties["kotlin_language_version"] as? String)?.also { languageVersion = it }
+        (project.rootProject.properties["kotlin_api_version"] as? String)?.also { apiVersion = it }
+      }
+    }
   }
 }
 
@@ -69,10 +79,6 @@ allprojects {
   group = property("projects.group").toString()
 }
 
-val enableCompatibilityMetadataVariant =
-  providers.gradleProperty("kotlin.mpp.enableCompatibilityMetadataVariant")
-    .orNull?.toBoolean() == true
-
 subprojects {
   this@subprojects.tasks.withType<DokkaTaskPartial>().configureEach {
     this@subprojects.extensions.findByType<KotlinProjectExtension>()?.sourceSets?.forEach { kotlinSourceSet ->

gradle/libs.versions.toml

@@ -1,15 +1,15 @@
 [versions]
 animalSniffer = "1.7.1"
-arrowGradleConfig = "0.12.0-rc.5"
+arrowGradleConfig = "0.12.0-rc.6"
 assertj = "3.24.2"
 coroutines = "1.7.3"
 classgraph = "4.8.162"
-dokka = "1.8.20"
+dokka = "1.9.0"
 jUnit = "4.13.2"
 jUnitJupiter = "5.10.0"
 jUnitVintage = "5.10.0"
-kotest = "5.6.2"
-kotestGradle = "5.6.2"
+kotest = "5.7.2"
+kotestGradle = "5.7.2"
 kover = "0.7.3"
 kotlin = "1.9.10"
 kotlinxSerializationPlugin = "1.9.10"

settings.gradle.kts

@@ -3,31 +3,35 @@ enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 rootProject.name = "arrow"
 
 pluginManagement {
+  @Suppress("LocalVariableName") val kotlin_repo_url: String? by settings
   repositories {
     gradlePluginPortal()
     mavenCentral()
     mavenLocal()
-    maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/bootstrap")
+    kotlin_repo_url?.also { maven(it) }
   }
 }
 
 plugins {
-  id("com.gradle.enterprise") version "3.14.1"
+  id("com.gradle.enterprise") version "3.15"
   id("org.gradle.toolchains.foojay-resolver-convention") version("0.7.0")
 }
 
 dependencyResolutionManagement {
+  @Suppress("LocalVariableName") val kotlin_repo_url: String? by settings
+  @Suppress("LocalVariableName") val kotlin_version: String? by settings
+
   repositories {
     mavenCentral()
     gradlePluginPortal()
     mavenLocal()
+    kotlin_repo_url?.also { maven(it) }
   }
   versionCatalogs {
     create("libs") {
-      val kotlinOverride = System.getenv("KOTLIN_OVERRIDE")
-      if (!kotlinOverride.isNullOrBlank()) {
-        println("Overriding Kotlin version with $kotlinOverride")
-        version("kotlin", kotlinOverride)
+      if (!kotlin_version.isNullOrBlank()) {
+        println("Overriding Kotlin version with $kotlin_version")
+        version("kotlin", kotlin_version!!)
       }
     }
   }