Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
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
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,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
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@
<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.5</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>databricks-dbutils-scala_2.12</artifactId>
<artifactId>databricks-dbutils-scala_2.13</artifactId>
<name>DBUtils for Scala</name>
<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 @@ -47,12 +47,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 @@ -77,11 +77,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
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.5</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.5</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
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.5</version>
<packaging>pom</packaging>
<name>DBUtils for Scala</name>
Expand Down
4 changes: 2 additions & 2 deletions release/pom.xml
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.5</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>release-2.12</artifactId>
<artifactId>release-2.13</artifactId>
<name>Release Module</name>
<description>Module purely for release using maven central publising plugin</description>
<build>
Expand Down
Loading