From 9456813524fcd99d9258257b8abbbcdb2c9ac8d2 Mon Sep 17 00:00:00 2001
From: Tanmay Rustagi <tanmay.rustagi@databricks.com>
Date: Tue, 12 Sep 2023 20:17:24 +0200
Subject: [PATCH 1/2] Part-2 of release fix for scala 2.13

---
 .github/workflows/pr.yaml        |  2 +-
 .github/workflows/release.yml    |  4 ++--
 databricks-dbutils-scala/pom.xml | 14 +++++++-------
 examples/pom.xml                 |  6 +++---
 pom.xml                          |  2 +-
 release/pom.xml                  |  4 ++--
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
index d00fa2f..d6b632c 100644
--- a/.github/workflows/pr.yaml
+++ b/.github/workflows/pr.yaml
@@ -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
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ccfeeb5..473f3f9 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -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
diff --git a/databricks-dbutils-scala/pom.xml b/databricks-dbutils-scala/pom.xml
index 457927c..8170a86 100644
--- a/databricks-dbutils-scala/pom.xml
+++ b/databricks-dbutils-scala/pom.xml
@@ -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>
@@ -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>
@@ -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>
diff --git a/examples/pom.xml b/examples/pom.xml
index cb7bc6c..b71a5fa 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -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>
@@ -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>
@@ -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>
diff --git a/pom.xml b/pom.xml
index d8b43ac..cb07ce9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
diff --git a/release/pom.xml b/release/pom.xml
index da6d7ed..5d16998 100644
--- a/release/pom.xml
+++ b/release/pom.xml
@@ -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>

From a67e6ae92c74403e43367acb7f86445595830510 Mon Sep 17 00:00:00 2001
From: Tanmay Rustagi <tanmay.rustagi@databricks.com>
Date: Tue, 12 Sep 2023 20:19:44 +0200
Subject: [PATCH 2/2] Part-2 of release fix for scala 2.13

---
 .github/workflows/pr.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
index d6b632c..0e4205a 100644
--- a/.github/workflows/pr.yaml
+++ b/.github/workflows/pr.yaml
@@ -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