SNOW-923322 Upgrade to Scala 2.12.18 (#61)

* reformat * add upgrade to scala 2.12.15 * update to scala 2.12.18 * add profile * update test-coverage * fix pom
snowflakedb · Nov 7, 2023 · c9d4942 · c9d4942
1 parent c8a0e60
commit c9d4942
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 26 deletions.
diff --git a/fips-pom.xml b/fips-pom.xml
@@ -34,7 +34,7 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <encoding>UTF-8</encoding>
-        <scala.version>2.12.11</scala.version>
+        <scala.version>2.12.18</scala.version>
         <scala.compat.version>2.12</scala.compat.version>
         <spec2.version>4.2.0</spec2.version>
         <snowflake.jdbc.version>3.14.1</snowflake.jdbc.version>
@@ -478,6 +478,12 @@
     </build>
 
     <profiles>
+        <profile>
+            <id>test-coverage</id>
+            <properties>
+                <scala.version>2.12.15</scala.version>
+            </properties>
+        </profile>
         <profile>
           <id>ossrh-deploy</id>
           <activation>

diff --git a/pom.xml b/pom.xml
@@ -34,13 +34,13 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <encoding>UTF-8</encoding>
-        <scala.version>2.12.11</scala.version>
+        <scala.version>2.12.18</scala.version>
         <scala.compat.version>2.12</scala.compat.version>
         <spec2.version>4.2.0</spec2.version>
         <snowflake.jdbc.version>3.14.1</snowflake.jdbc.version>
         <version.scala.binary>${scala.compat.version}</version.scala.binary>
         <doctitle>Snowpark ${project.version}</doctitle>
-        <scoverage.plugin.version>1.4.0</scoverage.plugin.version>
+        <scoverage.plugin.version>1.4.11</scoverage.plugin.version>
         <bouncycastle.version>1.64</bouncycastle.version>
         <scoverage.aggregate>true</scoverage.aggregate>
         <scalaPluginVersion>4.3.0</scalaPluginVersion>
@@ -443,19 +443,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.scoverage</groupId>
-                <artifactId>scoverage-maven-plugin</artifactId>
-                <version>${scoverage.plugin.version}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>check</goal> <!-- or integration-check -->
-                        </goals>
-                        <phase>prepare-package</phase> <!-- or any other phase -->
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
               <groupId>org.apache.maven.plugins</groupId>
               <artifactId>maven-gpg-plugin</artifactId>
@@ -506,6 +493,29 @@
     </build>
 
     <profiles>
+        <profile>
+            <id>test-coverage</id>
+            <properties>
+                <scala.version>2.12.15</scala.version>
+            </properties>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.scoverage</groupId>
+                        <artifactId>scoverage-maven-plugin</artifactId>
+                        <version>${scoverage.plugin.version}</version>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>check</goal> <!-- or integration-check -->
+                                </goals>
+                                <phase>prepare-package</phase> <!-- or any other phase -->
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
         <profile>
           <id>ossrh-deploy</id>
           <activation>

diff --git a/scripts/jenkins_regress.sh b/scripts/jenkins_regress.sh
@@ -18,7 +18,7 @@ exit_code_decorator(){
 gpg --quiet --batch --yes --decrypt --passphrase="$GPG_KEY" --output profile.properties scripts/profile.properties.gpg
 
 exit_code_decorator "mvn clean compile"
-exit_code_decorator "mvn -Dgpg.skip -DtagsToExclude=com.snowflake.snowpark.PerfTest -e scoverage:report"
+exit_code_decorator "mvn -Dgpg.skip -DtagsToExclude=com.snowflake.snowpark.PerfTest -e scoverage:report -P test-coverage"
 
 version=`git rev-parse HEAD`
 

diff --git a/src/main/java/com/snowflake/snowpark_java/Functions.java b/src/main/java/com/snowflake/snowpark_java/Functions.java
@@ -2365,14 +2365,13 @@ public static Column regexp_count(Column strExpr, Column pattern) {
    */
   public static Column regexp_replace(Column strExpr, Column pattern) {
     return new Column(
-            com.snowflake.snowpark.functions.regexp_replace(
-                    strExpr.toScalaColumn(), pattern.toScalaColumn()));
+        com.snowflake.snowpark.functions.regexp_replace(
+            strExpr.toScalaColumn(), pattern.toScalaColumn()));
   }
 
   /**
-   * Returns the subject with the specified pattern (or all occurrences of the pattern)
-   * replaced by a replacement string. If no matches are found, returns the original
-   * subject.
+   * Returns the subject with the specified pattern (or all occurrences of the pattern) replaced by
+   * a replacement string. If no matches are found, returns the original subject.
    *
    * @param strExpr The input string
    * @param pattern The pattern
@@ -2382,8 +2381,8 @@ public static Column regexp_replace(Column strExpr, Column pattern) {
    */
   public static Column regexp_replace(Column strExpr, Column pattern, Column replacement) {
     return new Column(
-            com.snowflake.snowpark.functions.regexp_replace(
-                    strExpr.toScalaColumn(), pattern.toScalaColumn(), replacement.toScalaColumn()));
+        com.snowflake.snowpark.functions.regexp_replace(
+            strExpr.toScalaColumn(), pattern.toScalaColumn(), replacement.toScalaColumn()));
   }
 
   /**

diff --git a/src/main/scala/com/snowflake/snowpark/functions.scala b/src/main/scala/com/snowflake/snowpark/functions.scala
@@ -1817,7 +1817,6 @@ object functions {
   def regexp_replace(strExpr: Column, pattern: Column, replacement: Column): Column =
     builtin("regexp_replace")(strExpr, pattern, replacement)
 
-
   /**
    * Removes all occurrences of a specified strExpr,
    * and optionally replaces them with replacement.

diff --git a/src/test/java/com/snowflake/snowpark_test/JavaFunctionSuite.java b/src/test/java/com/snowflake/snowpark_test/JavaFunctionSuite.java
@@ -1457,7 +1457,7 @@ public void regexp_replace() {
     Column replacement = Functions.lit("ch");
     Row[] expected1 = {Row.create("cht"), Row.create("chg"), Row.create("chuse")};
     checkAnswer(
-            df.select(Functions.regexp_replace(df.col("a"), pattern, replacement)), expected1, false);
+        df.select(Functions.regexp_replace(df.col("a"), pattern, replacement)), expected1, false);
   }
 
   @Test