Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

upgrade build #262

Merged
merged 2 commits into from
Apr 6, 2024
Merged

upgrade build #262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04738b6
upgrade build
pjfanning Apr 6, 2024
a2faf74
Update build-test.yml
pjfanning Apr 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions .github/workflows/build-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ jobs:
strategy:
fail-fast: false
matrix:
SCALA_VERSION: [2.12.18, 2.13.12, 3.3.1]
JAVA_VERSION: [8, 11]
SCALA_VERSION: [2.12.19, 2.13.13, 3.3.3]
JAVA_VERSION: [8, 11, 17]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

add 21 too?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

plan is to add that in another PR

steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -84,6 +84,7 @@ jobs:

- name: Compile and test for JDK ${{ matrix.JAVA_VERSION }}, Scala ${{ matrix.SCALA_VERSION }}
run: |-
cp .jvmopts-ci .jvmopts
sbt ++${{ matrix.SCALA_VERSION }} test
sbt ++${{ matrix.SCALA_VERSION }}! codegen/test

Expand Down Expand Up @@ -148,7 +149,7 @@ jobs:
cat ~/.version

- name: Cache local Gradle repository
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
~/.gradle/caches
Expand Down Expand Up @@ -204,7 +205,7 @@ jobs:
cat ~/.version

- name: Cache local Maven repository
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('plugin-tester-*/pom.xml') }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-1.0-nightly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ jobs:
run: |-
cp .jvmopts-ci .jvmopts
sbt +publish
sbt ++2.13.12! codegen/publish
sbt ++3.3.1! codegen/publish
sbt ++2.13.13! codegen/publish
sbt ++3.3.3! codegen/publish
env:
NEXUS_USER: ${{ secrets.NEXUS_USER }}
NEXUS_PW: ${{ secrets.NEXUS_PW }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-nightly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ jobs:
run: |-
cp .jvmopts-ci .jvmopts
sbt +publish
sbt ++2.13.12! codegen/publish
sbt ++3.3.1! codegen/publish
sbt ++2.13.13! codegen/publish
sbt ++3.3.3! codegen/publish
env:
NEXUS_USER: ${{ secrets.NEXUS_USER }}
NEXUS_PW: ${{ secrets.NEXUS_PW }}
Expand Down
2 changes: 1 addition & 1 deletion plugin-tester-java/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ repositories {
mavenLocal()
}

def scalaFullVersion = "2.12.18"
def scalaFullVersion = "2.12.19"
def scalaVersion = org.gradle.util.VersionNumber.parse(scalaFullVersion)
def scalaBinaryVersion = "${scalaVersion.major}.${scalaVersion.minor}"

Expand Down
2 changes: 1 addition & 1 deletion plugin-tester-scala/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ repositories {
mavenLocal()
}

def scalaFullVersion = "2.12.18"
def scalaFullVersion = "2.12.19"
def scalaVersion = org.gradle.util.VersionNumber.parse(scalaFullVersion)
def scalaBinaryVersion = "${scalaVersion.major}.${scalaVersion.minor}"

Expand Down
2 changes: 1 addition & 1 deletion sbt-plugin/src/sbt-test/gen-java/01-gen-basic-java/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

// Can be removed when we move to 2.12.14
// https://github.com/akka/akka-grpc/pull/1279
scalaVersion := "2.12.18"
scalaVersion := "2.12.19"

enablePlugins(PekkoGrpcPlugin)

Expand Down
2 changes: 1 addition & 1 deletion sbt-plugin/src/sbt-test/gen-java/02-server-reflection/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

// Can be removed when we move to 2.12.14
// https://github.com/akka/akka-grpc/pull/1279
scalaVersion := "2.12.18"
scalaVersion := "2.12.19"

enablePlugins(PekkoGrpcPlugin)

Expand Down
2 changes: 1 addition & 1 deletion sbt-plugin/src/sbt-test/gen-java/03-no-java-package/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

// Can be removed when we move to 2.12.14
// https://github.com/akka/akka-grpc/pull/1279
scalaVersion := "2.12.18"
scalaVersion := "2.12.19"

enablePlugins(PekkoGrpcPlugin)

Expand Down
2 changes: 1 addition & 1 deletion sbt-plugin/src/sbt-test/gen-java/04-crash-on-keywords/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

// Can be removed when we move to 2.12.14
// https://github.com/akka/akka-grpc/pull/1279
scalaVersion := "2.12.18"
scalaVersion := "2.12.19"

enablePlugins(PekkoGrpcPlugin)

Expand Down
2 changes: 1 addition & 1 deletion sbt-plugin/src/sbt-test/gen-java/05-duplicate-messages-different-packages/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

// Can be removed when we move to 2.12.14
// https://github.com/akka/akka-grpc/pull/1279
scalaVersion := "2.12.18"
scalaVersion := "2.12.19"

enablePlugins(PekkoGrpcPlugin)

Expand Down
2 changes: 1 addition & 1 deletion sbt-plugin/src/sbt-test/gen-scala-server/00-interop/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

// Can be removed when we move to 2.12.14
// https://github.com/akka/akka-grpc/pull/1279
scalaVersion := "2.12.18"
scalaVersion := "2.12.19"

organization := "org.apache.pekko"

Expand Down
2 changes: 1 addition & 1 deletion sbt-plugin/src/sbt-test/gen-scala-server/01-gen-basic-server/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

// Can be removed when we move to 2.12.14
// https://github.com/akka/akka-grpc/pull/1279
scalaVersion := "2.12.18"
scalaVersion := "2.12.19"

scalacOptions += "-Xfatal-warnings"

Expand Down
2 changes: 1 addition & 1 deletion sbt-plugin/src/sbt-test/gen-scala-server/02-multiple-services/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@

// Can be removed when we move to 2.12.14
// https://github.com/akka/akka-grpc/pull/1279
scalaVersion := "2.12.18"
scalaVersion := "2.12.19"

enablePlugins(PekkoGrpcPlugin)
2 changes: 1 addition & 1 deletion sbt-plugin/src/sbt-test/gen-scala-server/03-test-config/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

// Can be removed when we move to 2.12.14
// https://github.com/akka/akka-grpc/pull/1279
scalaVersion := "2.12.18"
scalaVersion := "2.12.19"

enablePlugins(PekkoGrpcPlugin)

Expand Down
2 changes: 1 addition & 1 deletion sbt-plugin/src/sbt-test/gen-scala-server/04-server-reflection/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@

// Can be removed when we move to 2.12.14
// https://github.com/akka/akka-grpc/pull/1279
scalaVersion := "2.12.18"
scalaVersion := "2.12.19"

enablePlugins(PekkoGrpcPlugin)
2 changes: 1 addition & 1 deletion sbt-plugin/src/sbt-test/gen-scala-server/05-no-java-package/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@

// Can be removed when we move to 2.12.14
// https://github.com/akka/akka-grpc/pull/1279
scalaVersion := "2.12.18"
scalaVersion := "2.12.19"

enablePlugins(PekkoGrpcPlugin)
2 changes: 1 addition & 1 deletion sbt-plugin/src/sbt-test/gen-scala-server/06-compatibility-plugins/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

// Can be removed when we move to 2.12.14
// https://github.com/akka/akka-grpc/pull/1279
scalaVersion := "2.12.18"
scalaVersion := "2.12.19"

enablePlugins(ProtocGoPlugin) // enable it first to test possibility of getting overriden

Expand Down
2 changes: 1 addition & 1 deletion sbt-plugin/src/sbt-test/gen-scala-server/07-gen-basic-server-with-pekko/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

// Can be removed when we move to 2.12.14
// https://github.com/akka/akka-grpc/pull/1279
scalaVersion := "2.12.18"
scalaVersion := "2.12.19"

enablePlugins(PekkoGrpcPlugin)

Expand Down
2 changes: 1 addition & 1 deletion sbt-plugin/src/sbt-test/gen-scala-server/09-scalapb-customizations/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

// Can be removed when we move to 2.12.14
// https://github.com/akka/akka-grpc/pull/1279
scalaVersion := "2.12.18"
scalaVersion := "2.12.19"

enablePlugins(PekkoGrpcPlugin)

Expand Down
2 changes: 1 addition & 1 deletion sbt-plugin/src/sbt-test/gen-scala-server/10-scalapb-validate/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

// Can be removed when we move to 2.12.14
// https://github.com/akka/akka-grpc/pull/1279
scalaVersion := "2.12.18"
scalaVersion := "2.12.19"

//#setup
import scalapb.GeneratorOption._
Expand Down
Loading