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

Release fix for scala 2.13 #29

Merged
merged 2 commits into from
Sep 13, 2023
Merged

Release fix for scala 2.13 #29

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
9456813
Part-2 of release fix for scala 2.13
tanmay-db Sep 12, 2023
a67e6ae
Part-2 of release fix for scala 2.13
tanmay-db Sep 12, 2023
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
4 changes: 2 additions & 2 deletions .github/workflows/pr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
restore-keys: ${{ runner.os }}-m2

- name: Check formatting
run: mvn --errors --no-transfer-progress spotless:check -Pscala-2.12
run: mvn --errors --no-transfer-progress spotless:check -Pscala-2.13

test:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -57,4 +57,4 @@ jobs:
restore-keys: ${{ runner.os }}-m2

- name: Run tests
run: mvn --errors --no-transfer-progress test -Pscala-2.12
run: mvn --errors --no-transfer-progress test -Pscala-2.13
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ jobs:
fail-fast: false
matrix:
profile:
- scala-2.12
# - scala-2.13
# - scala-2.12
- scala-2.13
steps:
- name: Checkout
uses: actions/checkout@v3
Expand Down
14 changes: 7 additions & 7 deletions databricks-dbutils-scala/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.databricks</groupId>
<artifactId>databricks-dbutils-scala-parent_2.12</artifactId>
<artifactId>databricks-dbutils-scala-parent_2.13</artifactId>
<version>0.1.4</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>databricks-dbutils-scala_2.12</artifactId>
<artifactId>databricks-dbutils-scala_2.13</artifactId>
<dependencies>
<!-- Scala Standard Library -->
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
<version>2.12.10</version>
<version>2.13.5</version>
</dependency>
<!-- Nullable annotation -->
<dependency>
Expand Down Expand Up @@ -46,12 +46,12 @@
<!-- Scalatest test harness -->
<dependency>
<groupId>org.scalactic</groupId>
<artifactId>scalactic_2.12</artifactId>
<artifactId>scalactic_2.13</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.scalatest</groupId>
<artifactId>scalatest_2.12</artifactId>
<artifactId>scalatest_2.13</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Expand All @@ -76,11 +76,11 @@
<artifactId>scala-maven-plugin</artifactId>
<version>4.4.0</version>
<configuration>
<scalaVersion>2.12.10</scalaVersion>
<scalaVersion>2.13.5</scalaVersion>
<compilerPlugins>
<compilerPlugin>
<groupId>com.artima.supersafe</groupId>
<artifactId>supersafe_2.12.10</artifactId>
<artifactId>supersafe_2.13.5</artifactId>
<version>1.1.12</version>
</compilerPlugin>
</compilerPlugins>
Expand Down
6 changes: 3 additions & 3 deletions examples/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.databricks</groupId>
<artifactId>databricks-dbutils-scala-parent_2.12</artifactId>
<artifactId>databricks-dbutils-scala-parent_2.13</artifactId>
<version>0.1.4</version>
<relativePath>../pom.xml</relativePath>
</parent>
Expand All @@ -23,7 +23,7 @@
</dependency>
<dependency>
<groupId>com.databricks</groupId>
<artifactId>databricks-dbutils-scala_2.12</artifactId>
<artifactId>databricks-dbutils-scala_2.13</artifactId>
<version>0.1.4</version>
</dependency>
</dependencies>
Expand All @@ -34,7 +34,7 @@
<artifactId>scala-maven-plugin</artifactId>
<version>4.4.0</version>
<configuration>
<scalaVersion>2.12.10</scalaVersion>
<scalaVersion>2.13.5</scalaVersion>
</configuration>
<executions>
<execution>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<!-- Group and artifact identifiers, versioning -->
<groupId>com.databricks</groupId>
<artifactId>databricks-dbutils-scala-parent_2.12</artifactId>
<artifactId>databricks-dbutils-scala-parent_2.13</artifactId>
<version>0.1.4</version>
<packaging>pom</packaging>
<name>DBUtils for Scala</name>
Expand Down
4 changes: 2 additions & 2 deletions release/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.databricks</groupId>
<artifactId>databricks-dbutils-scala-parent_2.12</artifactId>
<artifactId>databricks-dbutils-scala-parent_2.13</artifactId>
<version>0.1.4</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>release-2.12</artifactId>
<artifactId>release-2.13</artifactId>
<name>Release Module</name>
<description>Module purely for releasing using Nexus staging plugin</description>
<build>
Expand Down