Skip to content

Commit 63b162f

Browse files
nomisRevserrasfranciscodr
authored
Prepare for 2.0 publication
Co-authored-by: Alejandro Serrano <[email protected]> Co-authored-by: franciscodr <[email protected]>
1 parent a203862 commit 63b162f

File tree

15 files changed

+179
-207
lines changed

15 files changed

+179
-207
lines changed

‎.github/workflows/githubpages.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: githubpages
22

33
on:
44
release:
5-
types: [published]
5+
types: [ released ]
66

77
env:
88
GRADLE_OPTS: -Dorg.gradle.daemon=false -Dorg.gradle.kotlin.dsl.internal.io.timeout=120000 -Dorg.gradle.jvmargs="-Xmx5g -XX:+HeapDumpOnOutOfMemoryError -XX:+UseParallelGC -XX:MaxMetaspaceSize=1g -Dfile.encoding=UTF-8"

‎.github/workflows/publish.yml

+11-27
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,17 @@
11
name: "Publish all libs, Arrow-stack and Docs"
22

33
on:
4-
push:
5-
branches: [ main ]
6-
workflow_dispatch:
7-
branches: [ main ]
8-
inputs:
9-
version:
10-
description: 'Version'
11-
required: true
12-
type: string
4+
release:
5+
types: [ published ]
136

147
env:
158
BASEDIR: ${{github.workspace}}/arrow-libs
169
GRADLE_OPTS: -Dorg.gradle.daemon=false -Dorg.gradle.kotlin.dsl.internal.io.timeout=120000 -Dorg.gradle.jvmargs="-Xmx5g -XX:+HeapDumpOnOutOfMemoryError -XX:+UseParallelGC -XX:MaxMetaspaceSize=1g -Dfile.encoding=UTF-8"
17-
OSS_USER: '${{ secrets.OSS_USER }}'
18-
OSS_TOKEN: '${{ secrets.OSS_TOKEN }}'
19-
OSS_STAGING_PROFILE_ID: '${{ secrets.OSS_STAGING_PROFILE_ID }}'
20-
SIGNING_KEY_NAME: '${{ secrets.SIGNING_KEY_NAME }}'
21-
SIGNING_KEY_ID: '${{ secrets.SIGNING_KEY_ID }}'
22-
SIGNING_KEY_PASSPHRASE: '${{ secrets.SIGNING_KEY_PASSPHRASE }}'
23-
SIGNING_KEY: '${{ secrets.SIGNING_KEY }}'
10+
ORG_GRADLE_PROJECT_mavenCentralUsername: '${{ secrets.OSS_USER }}'
11+
ORG_GRADLE_PROJECT_mavenCentralPassword: '${{ secrets.OSS_TOKEN }}'
12+
ORG_GRADLE_PROJECT_signingInMemoryKeyId: '${{ secrets.SIGNING_KEY_ID }}'
13+
ORG_GRADLE_PROJECT_signingInMemoryKey: '${{ secrets.SIGNING_KEY }}'
14+
ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: '${{ secrets.SIGNING_KEY_PASSPHRASE }}'
2415

2516
jobs:
2617
publish:
@@ -40,17 +31,10 @@ jobs:
4031
- name: Setup Gradle
4132
uses: gradle/actions/setup-gradle@v4
4233
with:
43-
cache-read-only: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/arrow-2' }}
34+
cache-read-only: ${{ github.ref != 'refs/heads/main' }}
4435

4536
- name: Assemble
46-
run: ./gradlew assemble -Pversion=${{ inputs.version }} -Penable_wasm=true
37+
run: ./gradlew assemble -Pversion=${{ github.event.release.name }} -Penable_wasm=true
4738

48-
- name: Upload reports
49-
if: failure()
50-
uses: actions/upload-artifact@v4
51-
with:
52-
name: 'reports-${{ matrix.os }}'
53-
path: '**/build/reports/**'
54-
55-
- name: Publish next major SNAPSHOT version
56-
run: ./gradlew -Pversion=${{ inputs.version }} publish
39+
- name: Publish artifacts
40+
run: ./gradlew -Pversion=${{ github.event.release.name }} publish -Penable_wasm=true

‎.github/workflows/pull_request.yml

+10-10
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- name: Setup Gradle
3030
uses: gradle/actions/setup-gradle@v4
3131
with:
32-
cache-read-only: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/arrow-2' }}
32+
cache-read-only: ${{ github.ref != 'refs/heads/main' }}
3333

3434
- name: Knit and API checks
3535
run: ./gradlew knitCheck apiCheck --scan
@@ -59,7 +59,7 @@ jobs:
5959
- name: Setup Gradle
6060
uses: gradle/actions/setup-gradle@v4
6161
with:
62-
cache-read-only: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/arrow-2' }}
62+
cache-read-only: ${{ github.ref != 'refs/heads/main' }}
6363

6464
- name: iOS and watchOS tests
6565
run: ./gradlew iosSimulatorArm64Test iosX64Test watchosSimulatorArm64Test watchosX64Test --parallel --scan
@@ -89,7 +89,7 @@ jobs:
8989
- name: Setup Gradle
9090
uses: gradle/actions/setup-gradle@v4
9191
with:
92-
cache-read-only: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/arrow-2' }}
92+
cache-read-only: ${{ github.ref != 'refs/heads/main' }}
9393

9494
- name: Update API files
9595
run: ./gradlew apiDump
@@ -118,7 +118,7 @@ jobs:
118118
- name: Setup Gradle
119119
uses: gradle/actions/setup-gradle@v4
120120
with:
121-
cache-read-only: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/arrow-2' }}
121+
cache-read-only: ${{ github.ref != 'refs/heads/main' }}
122122

123123
- name: Apply Spotless rules
124124
run: ./gradlew spotlessApply
@@ -147,7 +147,7 @@ jobs:
147147
- name: Setup Gradle
148148
uses: gradle/actions/setup-gradle@v4
149149
with:
150-
cache-read-only: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/arrow-2' }}
150+
cache-read-only: ${{ github.ref != 'refs/heads/main' }}
151151

152152
- name: macOS and tvOS tests
153153
run: ./gradlew macosArm64Test macosX64Test tvosSimulatorArm64Test tvosX64Test --parallel --scan
@@ -177,7 +177,7 @@ jobs:
177177
- name: Setup Gradle
178178
uses: gradle/actions/setup-gradle@v4
179179
with:
180-
cache-read-only: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/arrow-2' }}
180+
cache-read-only: ${{ github.ref != 'refs/heads/main' }}
181181

182182
- name: Windows (MinGW-w64) tests
183183
run: ./gradlew mingwX64Test --scan
@@ -207,7 +207,7 @@ jobs:
207207
- name: Setup Gradle
208208
uses: gradle/actions/setup-gradle@v4
209209
with:
210-
cache-read-only: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/arrow-2' }}
210+
cache-read-only: ${{ github.ref != 'refs/heads/main' }}
211211

212212
- name: JVM tests
213213
run: ./gradlew jvmTest --scan
@@ -251,7 +251,7 @@ jobs:
251251
- name: Setup Gradle
252252
uses: gradle/actions/setup-gradle@v4
253253
with:
254-
cache-read-only: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/arrow-2' }}
254+
cache-read-only: ${{ github.ref != 'refs/heads/main' }}
255255

256256
- name: Upgrade yarn.lock
257257
run: ./gradlew kotlinUpgradeYarnLock
@@ -285,7 +285,7 @@ jobs:
285285
- name: Setup Gradle
286286
uses: gradle/actions/setup-gradle@v4
287287
with:
288-
cache-read-only: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/arrow-2' }}
288+
cache-read-only: ${{ github.ref != 'refs/heads/main' }}
289289

290290
- name: Linux (x64) tests
291291
run: ./gradlew linuxX64Test --scan
@@ -315,7 +315,7 @@ jobs:
315315
- name: Setup Gradle
316316
uses: gradle/actions/setup-gradle@v4
317317
with:
318-
cache-read-only: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/arrow-2' }}
318+
cache-read-only: ${{ github.ref != 'refs/heads/main' }}
319319

320320
- name: Compile WebAssembly
321321
run: ./gradlew wasmJsApiBuild wasmJsJar wasmJsTest -Penable_wasm=true --scan

‎arrow-libs/core/arrow-cache4k/gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Maven publishing configuration
2-
POM_NAME=Arrow + cache4k
2+
POM_NAME=Arrow Cache4k
33
# Build configuration
44
kapt.incremental.apt=false

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
77
plugins {
88
id(libs.plugins.kotlin.multiplatform.get().pluginId)
99
alias(libs.plugins.arrowGradleConfig.kotlin)
10-
10+
alias(libs.plugins.publish)
1111
alias(libs.plugins.kotlinx.kover)
1212
alias(libs.plugins.spotless)
1313
id(libs.plugins.kotlinx.serialization.get().pluginId)

‎arrow-libs/core/arrow-core/src/commonMain/kotlin/arrow/core/raise/Fold.kt

+10-10
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public inline fun <Error, A, B> EagerEffect<Error, A>.fold(recover: (error: Erro
9494

9595
/**
9696
* The most general way to execute a computation using [Raise].
97-
* Depending on the outcome of the block, one of the two continuations is run:
97+
* Depending on the outcome of the block, one of the two lambdas is run:
9898
* - _success_ [transform] result of [A] to a value of [B].
9999
* - _raised_ [recover] from `raised` value of [Error] to a value of [B].
100100
*
@@ -116,7 +116,7 @@ public inline fun <Error, A, B> fold(
116116

117117
/**
118118
* The most general way to execute a computation using [Raise].
119-
* Depending on the outcome of the block, one of the three continuations is run:
119+
* Depending on the outcome of the block, one of the three lambdas is run:
120120
* - _success_ [transform] result of [A] to a value of [B].
121121
* - _raised_ [recover] from `raised` value of [Error] to a value of [B].
122122
* - _exception_ [catch] from [Throwable] by transforming value into [B].
@@ -172,16 +172,16 @@ public inline fun <Error, A, B> fold(
172172
* }
173173
* ```
174174
* ```text
175-
* arrow.core.continuations.RaiseCancellationException: Raised Continuation
176-
* at arrow.core.continuations.DefaultRaise.raise(Fold.kt:77)
175+
* arrow.core.raise.RaiseCancellationException: Raised Continuation
176+
* at arrow.core.raise.DefaultRaise.raise(Fold.kt:77)
177177
* at MainKtKt$main$error$1.invoke(MainKt.kt:6)
178178
* at MainKtKt$main$error$1.invoke(MainKt.kt:6)
179-
* at arrow.core.continuations.Raise$DefaultImpls.bind(Raise.kt:22)
180-
* at arrow.core.continuations.DefaultRaise.bind(Fold.kt:74)
181-
* at arrow.core.continuations.Effect__TracingKt$traced$2.invoke(Traced.kt:46)
182-
* at arrow.core.continuations.Effect__TracingKt$traced$2.invoke(Traced.kt:46)
183-
* at arrow.core.continuations.Effect__FoldKt.fold(Fold.kt:92)
184-
* at arrow.core.continuations.Effect.fold(Unknown Source)
179+
* at arrow.core.raise.Raise$DefaultImpls.bind(Raise.kt:22)
180+
* at arrow.core.raise.DefaultRaise.bind(Fold.kt:74)
181+
* at arrow.core.raise.Effect__TracingKt$traced$2.invoke(Traced.kt:46)
182+
* at arrow.core.raise.Effect__TracingKt$traced$2.invoke(Traced.kt:46)
183+
* at arrow.core.raise.Effect__FoldKt.fold(Fold.kt:92)
184+
* at arrow.core.raise.Effect.fold(Unknown Source)
185185
* at MainKtKt.main(MainKt.kt:8)
186186
* at MainKtKt.main(MainKt.kt)
187187
* ```

‎arrow-libs/core/arrow-core/src/commonTest/kotlin/arrow/core/raise/EffectSpec.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ class EffectSpec {
389389
}
390390
}
391391

392-
@Test fun issue2779HandleErrorWithDoesNotMakeNestedContinuationsHang() = runTest {
392+
@Test fun issue2779HandleErrorWithDoesNotMakeNestedEffectHang() = runTest {
393393
checkAll(Arb.string()) { error ->
394394
val failed: Effect<String, Int> = effect {
395395
withContext(Dispatchers.Default) {}
@@ -405,7 +405,7 @@ class EffectSpec {
405405
}
406406
}
407407

408-
@Test fun issue2779BindNestedInFoldDoesNotMakeNestedContinuationsHang() = runTest {
408+
@Test fun issue2779BindNestedInFoldDoesNotMakeNestedEffectHang() = runTest {
409409
checkAll(Arb.string()) { error ->
410410
val failed: Effect<String, Int> = effect {
411411
withContext(Dispatchers.Default) {}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ kotlin {
4545
jvm {
4646
tasks.jvmJar {
4747
manifest {
48-
attributes["Automatic-Module-Name"] = "arrow.continuations"
48+
attributes["Automatic-Module-Name"] = "arrow.functions"
4949
}
5050
}
5151
}

‎arrow-libs/fx/arrow-fx-coroutines/gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# Maven publishing configuration
2-
POM_NAME=Arrow-Fx-Coroutines
2+
POM_NAME=Arrow Fx Coroutines

‎arrow-libs/fx/arrow-fx-stm/gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# Maven publishing configuration
2-
POM_NAME=Arrow-Fx-STM
2+
POM_NAME=Arrow Fx STM

‎arrow-libs/optics/arrow-optics-ksp-plugin/gradle.properties

-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
11
# Maven publishing configuration
22
POM_NAME=Arrow Optics Compiler KSP Plugin
3-
POM_ARTIFACT_ID=arrow-optics-ksp-plugin
43
POM_PACKAGING=jar
5-
6-
POM_NAME=Arrow Optics Compiler KSP Plugin

‎arrow-libs/optics/arrow-optics-reflect/gradle.properties

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
11
# Maven publishing configuration
2-
POM_NAME=Arrow Optics for Kotlin Reflection
3-
# Build configuration
4-
kapt.incremental.apt=false
2+
POM_NAME=Arrow Optics Kotlin Reflection

‎arrow-libs/resilience/arrow-resilience/gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# Maven publishing configuration
2-
POM_NAME=Arrow-Fx-Resilience
2+
POM_NAME=Arrow Fx Resilience

‎gradle.properties

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
# Package definitions
21
projects.group=io.arrow-kt
3-
projects.version=2.0.0-SNAPSHOT
4-
52
enable_wasm=true
63
ksp.useKSP2=true
74

8-
# Pomfile definitions
9-
#RELEASE_SIGNING_ENABLED=true
5+
GROUP=io.arrow-kt
6+
SONATYPE_HOST=DEFAULT
7+
RELEASE_SIGNING_ENABLED=true
108

119
POM_DESCRIPTION=Functional companion to Kotlin's Standard Library
1210
POM_URL=https://github.com/arrow-kt/arrow/

0 commit comments

Comments
 (0)