diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6cbd035..c0afb25 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,83 +15,81 @@ on: tags: [v*] env: - PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }} - SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} - SONATYPE_CREDENTIAL_HOST: ${{ secrets.SONATYPE_CREDENTIAL_HOST }} - SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} - PGP_SECRET: ${{ secrets.PGP_SECRET }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + +concurrency: + group: ${{ github.workflow }} @ ${{ github.ref }} + cancel-in-progress: true + jobs: build: - name: Build and Test + name: Test strategy: matrix: - os: [ubuntu-latest] + os: [ubuntu-22.04] scala: [3, 2.13, 2.12] java: [temurin@17] + project: [java-time-literals-rootJS, java-time-literals-rootJVM, java-time-literals-rootNative] runs-on: ${{ matrix.os }} + timeout-minutes: 60 steps: - name: Checkout current branch (full) - uses: actions/checkout@v3 + uses: actions/checkout@v5 with: fetch-depth: 0 - - name: Download Java (temurin@17) - id: download-java-temurin-17 - if: matrix.java == 'temurin@17' - uses: typelevel/download-java@v2 - with: - distribution: temurin - java-version: 17 + - name: Setup sbt + uses: sbt/setup-sbt@v1 - name: Setup Java (temurin@17) + id: setup-java-temurin-17 if: matrix.java == 'temurin@17' - uses: actions/setup-java@v3 + uses: actions/setup-java@v5 with: - distribution: jdkfile + distribution: temurin java-version: 17 - jdkFile: ${{ steps.download-java-temurin-17.outputs.jdkFile }} + cache: sbt - - name: Cache sbt - uses: actions/cache@v3 - with: - path: | - ~/.sbt - ~/.ivy2/cache - ~/.coursier/cache/v1 - ~/.cache/coursier/v1 - ~/AppData/Local/Coursier/Cache/v1 - ~/Library/Caches/Coursier/v1 - key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} + - name: sbt update + if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false' + run: sbt +update - name: Check that workflows are up to date run: sbt githubWorkflowCheck + - name: scalaJSLink + if: matrix.project == 'java-time-literals-rootJS' + run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' Test/scalaJSLinkerResult + + - name: nativeLink + if: matrix.project == 'java-time-literals-rootNative' + run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' Test/nativeLink + - name: Test - run: sbt '++ ${{ matrix.scala }}' test + run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' test - name: Check binary compatibility - if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-latest' - run: sbt '++ ${{ matrix.scala }}' mimaReportBinaryIssues + if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-22.04' + run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' mimaReportBinaryIssues - name: Generate API documentation - if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-latest' - run: sbt '++ ${{ matrix.scala }}' doc + if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-22.04' + run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' doc - name: Make target directories if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main') - run: mkdir -p target core/js/target core/jvm/target core/native/target project/target + run: mkdir -p core/native/target core/jvm/target core/js/target project/target - name: Compress target directories if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main') - run: tar cf targets.tar target core/js/target core/jvm/target core/native/target project/target + run: tar cf targets.tar core/native/target core/jvm/target core/js/target project/target - name: Upload target directories if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main') - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.scala }} + name: target-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.scala }}-${{ matrix.project }} path: targets.tar publish: @@ -100,83 +98,177 @@ jobs: if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main') strategy: matrix: - os: [ubuntu-latest] + os: [ubuntu-22.04] java: [temurin@17] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) - uses: actions/checkout@v3 + uses: actions/checkout@v5 with: fetch-depth: 0 - - name: Download Java (temurin@17) - id: download-java-temurin-17 + - name: Setup sbt + uses: sbt/setup-sbt@v1 + + - name: Setup Java (temurin@17) + id: setup-java-temurin-17 if: matrix.java == 'temurin@17' - uses: typelevel/download-java@v2 + uses: actions/setup-java@v5 with: distribution: temurin java-version: 17 + cache: sbt - - name: Setup Java (temurin@17) - if: matrix.java == 'temurin@17' - uses: actions/setup-java@v3 + - name: sbt update + if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false' + run: sbt +update + + - name: Download target directories (3, java-time-literals-rootJS) + uses: actions/download-artifact@v4 with: - distribution: jdkfile - java-version: 17 - jdkFile: ${{ steps.download-java-temurin-17.outputs.jdkFile }} + name: target-${{ matrix.os }}-${{ matrix.java }}-3-java-time-literals-rootJS + + - name: Inflate target directories (3, java-time-literals-rootJS) + run: | + tar xf targets.tar + rm targets.tar - - name: Cache sbt - uses: actions/cache@v3 + - name: Download target directories (3, java-time-literals-rootJVM) + uses: actions/download-artifact@v4 with: - path: | - ~/.sbt - ~/.ivy2/cache - ~/.coursier/cache/v1 - ~/.cache/coursier/v1 - ~/AppData/Local/Coursier/Cache/v1 - ~/Library/Caches/Coursier/v1 - key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} + name: target-${{ matrix.os }}-${{ matrix.java }}-3-java-time-literals-rootJVM - - name: Download target directories (3) - uses: actions/download-artifact@v3 + - name: Inflate target directories (3, java-time-literals-rootJVM) + run: | + tar xf targets.tar + rm targets.tar + + - name: Download target directories (3, java-time-literals-rootNative) + uses: actions/download-artifact@v4 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-3 + name: target-${{ matrix.os }}-${{ matrix.java }}-3-java-time-literals-rootNative - - name: Inflate target directories (3) + - name: Inflate target directories (3, java-time-literals-rootNative) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (2.13) - uses: actions/download-artifact@v3 + - name: Download target directories (2.13, java-time-literals-rootJS) + uses: actions/download-artifact@v4 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.13 + name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-java-time-literals-rootJS - - name: Inflate target directories (2.13) + - name: Inflate target directories (2.13, java-time-literals-rootJS) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (2.12) - uses: actions/download-artifact@v3 + - name: Download target directories (2.13, java-time-literals-rootJVM) + uses: actions/download-artifact@v4 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.12 + name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-java-time-literals-rootJVM - - name: Inflate target directories (2.12) + - name: Inflate target directories (2.13, java-time-literals-rootJVM) + run: | + tar xf targets.tar + rm targets.tar + + - name: Download target directories (2.13, java-time-literals-rootNative) + uses: actions/download-artifact@v4 + with: + name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-java-time-literals-rootNative + + - name: Inflate target directories (2.13, java-time-literals-rootNative) + run: | + tar xf targets.tar + rm targets.tar + + - name: Download target directories (2.12, java-time-literals-rootJS) + uses: actions/download-artifact@v4 + with: + name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-java-time-literals-rootJS + + - name: Inflate target directories (2.12, java-time-literals-rootJS) + run: | + tar xf targets.tar + rm targets.tar + + - name: Download target directories (2.12, java-time-literals-rootJVM) + uses: actions/download-artifact@v4 + with: + name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-java-time-literals-rootJVM + + - name: Inflate target directories (2.12, java-time-literals-rootJVM) + run: | + tar xf targets.tar + rm targets.tar + + - name: Download target directories (2.12, java-time-literals-rootNative) + uses: actions/download-artifact@v4 + with: + name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-java-time-literals-rootNative + + - name: Inflate target directories (2.12, java-time-literals-rootNative) run: | tar xf targets.tar rm targets.tar - name: Import signing key if: env.PGP_SECRET != '' && env.PGP_PASSPHRASE == '' - run: echo $PGP_SECRET | base64 -di | gpg --import + env: + PGP_SECRET: ${{ secrets.PGP_SECRET }} + PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }} + run: echo $PGP_SECRET | base64 -d -i - | gpg --import - name: Import signing key and strip passphrase if: env.PGP_SECRET != '' && env.PGP_PASSPHRASE != '' + env: + PGP_SECRET: ${{ secrets.PGP_SECRET }} + PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }} run: | - echo "$PGP_SECRET" | base64 -di > /tmp/signing-key.gpg + echo "$PGP_SECRET" | base64 -d -i - > /tmp/signing-key.gpg echo "$PGP_PASSPHRASE" | gpg --pinentry-mode loopback --passphrase-fd 0 --import /tmp/signing-key.gpg (echo "$PGP_PASSPHRASE"; echo; echo) | gpg --command-fd 0 --pinentry-mode loopback --change-passphrase $(gpg --list-secret-keys --with-colons 2> /dev/null | grep '^sec:' | cut --delimiter ':' --fields 5 | tail -n 1) - name: Publish + env: + SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} + SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} + SONATYPE_CREDENTIAL_HOST: ${{ secrets.SONATYPE_CREDENTIAL_HOST }} run: sbt tlCiRelease + + dependency-submission: + name: Submit Dependencies + if: github.event.repository.fork == false && github.event_name != 'pull_request' + strategy: + matrix: + os: [ubuntu-22.04] + java: [temurin@17] + runs-on: ${{ matrix.os }} + steps: + - name: Checkout current branch (full) + uses: actions/checkout@v5 + with: + fetch-depth: 0 + + - name: Setup sbt + uses: sbt/setup-sbt@v1 + + - name: Setup Java (temurin@17) + id: setup-java-temurin-17 + if: matrix.java == 'temurin@17' + uses: actions/setup-java@v5 + with: + distribution: temurin + java-version: 17 + cache: sbt + + - name: sbt update + if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false' + run: sbt +update + + - name: Submit Dependencies + uses: scalacenter/sbt-dependency-submission@v2 + with: + modules-ignore: java-time-literals-rootjs_2.13 java-time-literals-rootjs_2.12 java-time-literals-rootjs_3 java-time-literals-rootjvm_2.13 java-time-literals-rootjvm_2.12 java-time-literals-rootjvm_3 java-time-literals-rootnative_2.13 java-time-literals-rootnative_2.12 java-time-literals-rootnative_3 + configs-ignore: test scala-tool scala-doc-tool test-internal diff --git a/.mergify.yml b/.mergify.yml index 5d1d68a..0d75c1a 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -12,9 +12,15 @@ pull_request_rules: - or: - body~=labels:.*early-semver-patch - body~=labels:.*early-semver-minor - - status-success=Build and Test (ubuntu-latest, 3, temurin@17) - - status-success=Build and Test (ubuntu-latest, 2.13, temurin@17) - - status-success=Build and Test (ubuntu-latest, 2.12, temurin@17) + - status-success=Test (ubuntu-22.04, 3, temurin@17, java-time-literals-rootJS) + - status-success=Test (ubuntu-22.04, 3, temurin@17, java-time-literals-rootJVM) + - status-success=Test (ubuntu-22.04, 3, temurin@17, java-time-literals-rootNative) + - status-success=Test (ubuntu-22.04, 2.13, temurin@17, java-time-literals-rootJS) + - status-success=Test (ubuntu-22.04, 2.13, temurin@17, java-time-literals-rootJVM) + - status-success=Test (ubuntu-22.04, 2.13, temurin@17, java-time-literals-rootNative) + - status-success=Test (ubuntu-22.04, 2.12, temurin@17, java-time-literals-rootJS) + - status-success=Test (ubuntu-22.04, 2.12, temurin@17, java-time-literals-rootJVM) + - status-success=Test (ubuntu-22.04, 2.12, temurin@17, java-time-literals-rootNative) - '#approved-reviews-by>=1' actions: merge: {} diff --git a/build.sbt b/build.sbt index 1a231ad..e8055ab 100644 --- a/build.sbt +++ b/build.sbt @@ -1,13 +1,13 @@ import scala.collection.immutable lazy val V = new { - val SCALA_2_12 = "2.12.18" - val SCALA_2_13 = "2.13.11" - val SCALA_3 = "3.3.3" + val SCALA_2_12 = "2.12.20" + val SCALA_2_13 = "2.13.17" + val SCALA_3 = "3.3.6" val Scalas = Seq(SCALA_2_13, SCALA_2_12, SCALA_3) - val literally = "1.1.0" - val scalaJavaTime = "2.5.0" - val munit = "1.0.0-M8" + val literally = "1.2.0" + val scalaJavaTime = "2.6.0" + val munit = "1.2.0" } ThisBuild / scalaVersion := V.Scalas.head @@ -27,18 +27,16 @@ ThisBuild / startYear := Option(2021) ThisBuild / tlBaseVersion := "1.1" ThisBuild / tlCiReleaseBranches := Seq("main") -ThisBuild / mergifyStewardConfig ~= { - _.map(_.copy(mergeMinors = true)) -} +ThisBuild / mergifyStewardConfig ~= { _.map { + _.withMergeMinors(true) +}} ThisBuild / mergifySuccessConditions += MergifyCondition.Custom("#approved-reviews-by>=1") ThisBuild / mergifyRequiredJobs ++= Seq("validate-steward") -tpolecatScalacOptions += ScalacOptions.release("8") +ThisBuild / tlJdkRelease := Option(8) ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.temurin("17")) ThisBuild / githubWorkflowScalaVersions := Seq("3", "2.13", "2.12") -ThisBuild / tlSonatypeUseLegacyHost := false - lazy val `java-time-literals` = crossProject(JSPlatform, JVMPlatform, NativePlatform) .in(file("core")) .settings( @@ -62,14 +60,10 @@ lazy val `java-time-literals` = crossProject(JSPlatform, JVMPlatform, NativePlat Test / scalaJSLinkerConfig ~= { _.withModuleKind(ModuleKind.CommonJSModule) }, ) .nativeSettings( - tlVersionIntroduced := Map("2.12" -> "1.1.1", "2.13" -> "1.1.1", "3" -> "1.1.1"), + tlVersionIntroduced := Map("2.12" -> "1.2.0", "2.13" -> "1.2.0", "3" -> "1.2.0"), ) -lazy val `java-time-literals-root`: Project = (project in file(".")) - .settings( - publish / skip := true, - publishArtifact := false, - ) +lazy val `java-time-literals-root` = tlCrossRootProject .aggregate( - `java-time-literals`.componentProjects.map(_.project) * + `java-time-literals` ) diff --git a/project/build.properties b/project/build.properties index 04267b1..01a16ed 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.9 +sbt.version=1.11.7 diff --git a/project/plugins.sbt b/project/plugins.sbt index a7788aa..2b0a9ad 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,7 +1,7 @@ -addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.4.4") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0") -addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.17") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.20.1") +addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.8") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2") -addSbtPlugin("org.typelevel" % "sbt-typelevel-ci-release" % "0.4.22") -addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.4.22") +addSbtPlugin("org.typelevel" % "sbt-typelevel-settings" % "0.8.1") +addSbtPlugin("org.typelevel" % "sbt-typelevel-ci-release" % "0.8.1") +addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.8.1")