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.

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 2.12 #28

Merged
merged 6 commits into from
Sep 12, 2023
Merged
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
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/sdk-issue.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ The SDK logs helpful debugging information when debug logging is enabled. Set th

**Other Information**
- OS: [e.g. macOS]
- Version of the SDK: [e.g. 0.1.3]
- Version of the SDK: [e.g. 0.1.4]

**Additional context**
Add any other context about the problem here.
2 changes: 1 addition & 1 deletion .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,4 @@ jobs:
restore-keys: ${{ runner.os }}-m2

- name: Run tests
run: mvn --errors --no-transfer-progress test -P${{ matrix.profile }}
run: mvn --errors --no-transfer-progress test -Pscala-2.12
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
matrix:
profile:
- scala-2.12
- scala-2.13
# - scala-2.13
steps:
- name: Checkout
uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ You can install Databricks Utilities for Scala by adding the following to your `
<dependency>
<groupId>com.databricks</groupId>
<artifactId>databricks-sdk-dbutils</artifactId>
<version>0.1.3</version>
<version>0.1.4</version>
</dependency>
```

Expand Down
16 changes: 8 additions & 8 deletions databricks-dbutils-scala/pom.xml
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_${scala.major}.${scala.minor}</artifactId>
<version>0.1.3</version>
<artifactId>databricks-dbutils-scala-parent_2.12</artifactId>
<version>0.1.4</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>databricks-dbutils-scala_${scala.major}.${scala.minor}</artifactId>
<artifactId>databricks-dbutils-scala_2.12</artifactId>
<dependencies>
<!-- Scala Standard Library -->
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
<version>${scala.major}.${scala.minor}.${scala.patch}</version>
<version>2.12.10</version>
</dependency>
<!-- Nullable annotation -->
<dependency>
Expand Down Expand Up @@ -46,12 +46,12 @@
<!-- Scalatest test harness -->
<dependency>
<groupId>org.scalactic</groupId>
<artifactId>scalactic_${scala.major}.${scala.minor}</artifactId>
<artifactId>scalactic_2.12</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.scalatest</groupId>
<artifactId>scalatest_${scala.major}.${scala.minor}</artifactId>
<artifactId>scalatest_2.12</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Expand All @@ -76,11 +76,11 @@
<artifactId>scala-maven-plugin</artifactId>
<version>4.4.0</version>
<configuration>
<scalaVersion>${scala.major}.${scala.minor}.${scala.patch}</scalaVersion>
<scalaVersion>2.12.10</scalaVersion>
<compilerPlugins>
<compilerPlugin>
<groupId>com.artima.supersafe</groupId>
<artifactId>supersafe_${scala.major}.${scala.minor}.${scala.patch}</artifactId>
<artifactId>supersafe_2.12.10</artifactId>
<version>1.1.12</version>
</compilerPlugin>
</compilerPlugins>
Expand Down
10 changes: 5 additions & 5 deletions examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.databricks</groupId>
<artifactId>databricks-dbutils-scala-parent_${scala.major}.${scala.minor}</artifactId>
<version>0.1.3</version>
<artifactId>databricks-dbutils-scala-parent_2.12</artifactId>
<version>0.1.4</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>databricks-dbutils-scala-examples</artifactId>
Expand All @@ -23,8 +23,8 @@
</dependency>
<dependency>
<groupId>com.databricks</groupId>
<artifactId>databricks-dbutils-scala_${scala.major}.${scala.minor}</artifactId>
<version>0.1.3</version>
<artifactId>databricks-dbutils-scala_2.12</artifactId>
<version>0.1.4</version>
</dependency>
</dependencies>
<build>
Expand All @@ -34,7 +34,7 @@
<artifactId>scala-maven-plugin</artifactId>
<version>4.4.0</version>
<configuration>
<scalaVersion>${scala.major}.${scala.minor}.${scala.patch}</scalaVersion>
<scalaVersion>2.12.10</scalaVersion>
</configuration>
<executions>
<execution>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<modelVersion>4.0.0</modelVersion>
<!-- Group and artifact identifiers, versioning -->
<groupId>com.databricks</groupId>
<artifactId>databricks-dbutils-scala-parent_${scala.major}.${scala.minor}</artifactId>
<version>0.1.3</version>
<artifactId>databricks-dbutils-scala-parent_2.12</artifactId>
<version>0.1.4</version>
<packaging>pom</packaging>
<name>DBUtils for Scala</name>
<description>DBUtils for Scala simplifies interacting with various components of Databricks, such as the Databricks File
Expand Down
6 changes: 3 additions & 3 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_${scala.major}.${scala.minor}</artifactId>
<version>0.1.3</version>
<artifactId>databricks-dbutils-scala-parent_2.12</artifactId>
<version>0.1.4</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>release-${scala.major}.${scala.minor}</artifactId>
<artifactId>release-2.12</artifactId>
<name>Release Module</name>
<description>Module purely for releasing using Nexus staging plugin</description>
<build>
Expand Down