Skip to content

Commit

Permalink
Merge branch 'main' into racing
Browse files Browse the repository at this point in the history
  • Loading branch information
kyay10 authored Nov 3, 2024
2 parents 6331500 + 8a324df commit bf91964
Show file tree
Hide file tree
Showing 268 changed files with 6,788 additions and 1,975 deletions.
161 changes: 0 additions & 161 deletions .github/unused_workflows/publish.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/githubpages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
java-version: 17

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v3
uses: gradle/actions/setup-gradle@v4
with:
cache-read-only: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/arrow-2' }}

Expand Down
24 changes: 11 additions & 13 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,14 @@ name: "Publish all libs, Arrow-stack and Docs"

on:
push:
branch:
- 'arrow-2'
#on:
# workflow_dispatch:
# branches: [main]
# inputs:
# version:
# description: 'Version'
# required: true
# type: string
branches: [ main ]
workflow_dispatch:
branches: [ main ]
inputs:
version:
description: 'Version'
required: true
type: string

env:
BASEDIR: ${{github.workspace}}/arrow-libs
Expand Down Expand Up @@ -40,12 +38,12 @@ jobs:
java-version: 17

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v3
uses: gradle/actions/setup-gradle@v4
with:
cache-read-only: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/arrow-2' }}

- name: Assemble
run: ./gradlew assemble -Pversion=${{ inputs.version }}
run: ./gradlew assemble -Pversion=${{ inputs.version }} -Penable_wasm=true

- name: Upload reports
if: failure()
Expand All @@ -55,4 +53,4 @@ jobs:
path: '**/build/reports/**'

- name: Publish next major SNAPSHOT version
run: ./gradlew -Pversion=${{ inputs.version }} publishToSonatype closeSonatypeStagingRepository
run: ./gradlew -Pversion=${{ inputs.version }} publish
52 changes: 11 additions & 41 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
java-version: 17

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v3
uses: gradle/actions/setup-gradle@v4
with:
cache-read-only: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/arrow-2' }}

Expand Down Expand Up @@ -57,7 +57,7 @@ jobs:
java-version: 17

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v3
uses: gradle/actions/setup-gradle@v4
with:
cache-read-only: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/arrow-2' }}

Expand Down Expand Up @@ -87,7 +87,7 @@ jobs:
java-version: 17

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v3
uses: gradle/actions/setup-gradle@v4
with:
cache-read-only: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/arrow-2' }}

Expand Down Expand Up @@ -116,7 +116,7 @@ jobs:
java-version: 17

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v3
uses: gradle/actions/setup-gradle@v4
with:
cache-read-only: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/arrow-2' }}

Expand Down Expand Up @@ -145,7 +145,7 @@ jobs:
java-version: 17

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v3
uses: gradle/actions/setup-gradle@v4
with:
cache-read-only: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/arrow-2' }}

Expand Down Expand Up @@ -175,7 +175,7 @@ jobs:
java-version: 17

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v3
uses: gradle/actions/setup-gradle@v4
with:
cache-read-only: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/arrow-2' }}

Expand Down Expand Up @@ -205,7 +205,7 @@ jobs:
java-version: 17

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v3
uses: gradle/actions/setup-gradle@v4
with:
cache-read-only: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/arrow-2' }}

Expand Down Expand Up @@ -233,36 +233,6 @@ jobs:
name: 'reports-jvmTest'
path: '**/build/reports/**'

jvmK2:
runs-on: ubuntu-latest
timeout-minutes: 60

steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Set up Java
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: 17

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v3
with:
cache-read-only: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/arrow-2' }}

- name: JVM (Kotlin 2.0) tests
run: ./gradlew jvmTest -Pkotlin_version=2.0.0-RC1 -Pksp_version=2.0.0-RC1-1.0.20 -Pkotlin_language_version=2.0 -Pkotlin_api_version=2.0

- name: Upload reports
if: failure()
uses: actions/upload-artifact@v4
with:
name: 'reports-jvmTest'
path: '**/build/reports/**'

js:
runs-on: ubuntu-latest
timeout-minutes: 30
Expand All @@ -279,7 +249,7 @@ jobs:
java-version: 17

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v3
uses: gradle/actions/setup-gradle@v4
with:
cache-read-only: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/arrow-2' }}

Expand Down Expand Up @@ -313,7 +283,7 @@ jobs:
java-version: 17

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v3
uses: gradle/actions/setup-gradle@v4
with:
cache-read-only: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/arrow-2' }}

Expand Down Expand Up @@ -343,12 +313,12 @@ jobs:
java-version: 17

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v3
uses: gradle/actions/setup-gradle@v4
with:
cache-read-only: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/arrow-2' }}

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

- name: Upload reports
if: failure()
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Created by https://www.gitignore.io/api/android,intellij

### Kotlin ###

.kotlin

### Android ###
# Built application files
*.apk
Expand Down
Binary file added .idea/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<a href="https://arrow-kt.io" title="Arrow website"><img src="https://arrow-kt.io/img/arrow-brand.svg" width="200" alt=""></a>

[![Maven Central](https://img.shields.io/maven-central/v/io.arrow-kt/arrow-core?color=4caf50&label=latest%20release)](https://maven-badges.herokuapp.com/maven-central/io.arrow-kt/arrow-core)
[![Maven Central](https://img.shields.io/maven-central/v/io.arrow-kt/arrow-core?color=4caf50&label=latest%20release)](https://central.sonatype.com/search?q=g:io.arrow-kt)
[![Kotlin version](https://img.shields.io/badge/Kotlin-1.8.10-blue)](https://kotlinlang.org/docs/whatsnew18.html)

[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0)
Expand Down
Loading

0 comments on commit bf91964

Please sign in to comment.