From eab7ef0a2e7d9e3b7b0843c889b3d14ba538d3e6 Mon Sep 17 00:00:00 2001
From: Alexey Andreev <konsoletyper@gmail.com>
Date: Sun, 8 May 2022 18:43:49 +0300
Subject: [PATCH] Bump Scala version in Scala example. Add hack for Scala
 runtime.

---
 .../java/org/teavm/classlib/impl/ScalaHacks.java     | 12 ++++++++++++
 samples/scala/pom.xml                                |  4 ++--
 .../scala/org/teavm/samples/scala/Calculator.scala   |  2 +-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/classlib/src/main/java/org/teavm/classlib/impl/ScalaHacks.java b/classlib/src/main/java/org/teavm/classlib/impl/ScalaHacks.java
index b03de9a71..0b50db976 100644
--- a/classlib/src/main/java/org/teavm/classlib/impl/ScalaHacks.java
+++ b/classlib/src/main/java/org/teavm/classlib/impl/ScalaHacks.java
@@ -46,6 +46,9 @@ public class ScalaHacks implements ClassHolderTransformer {
             case "scala.util.Properties$":
                 transformProperties(cls);
                 break;
+            case "scala.runtime.Statics":
+                transformStatics(cls, context.getHierarchy());
+                break;
             default:
                 if (cls.getName().endsWith(SCALA_INTERNAL_CLASS_MARKER)) {
                     checkAndRemoveExportAnnotation(cls);
@@ -97,6 +100,15 @@ public class ScalaHacks implements ClassHolderTransformer {
         }
     }
 
+    private void transformStatics(ClassHolder cls, ClassHierarchy hierarchy) {
+        for (MethodHolder method : cls.getMethods()) {
+            if (method.getName().equals("releaseFence")) {
+                ProgramEmitter pe = ProgramEmitter.create(method, hierarchy);
+                pe.exit();
+            }
+        }
+    }
+
     private void checkAndRemoveExportAnnotation(ClassHolder cls) {
         for (MethodHolder method : cls.getMethods()) {
             AnnotationContainer items = method.getAnnotations();
diff --git a/samples/scala/pom.xml b/samples/scala/pom.xml
index 0376989c6..49875343a 100644
--- a/samples/scala/pom.xml
+++ b/samples/scala/pom.xml
@@ -15,7 +15,7 @@
 
   <properties>
     <java.version>1.8</java.version>
-    <scala.version>2.12.11</scala.version>
+    <scala.version>2.13.8</scala.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
   
@@ -45,7 +45,7 @@
       <plugin>
         <groupId>net.alchim31.maven</groupId>
         <artifactId>scala-maven-plugin</artifactId>
-        <version>4.3.1</version>
+        <version>4.6.1</version>
         <executions>
           <execution>
             <goals>
diff --git a/samples/scala/src/main/scala/org/teavm/samples/scala/Calculator.scala b/samples/scala/src/main/scala/org/teavm/samples/scala/Calculator.scala
index 6d10de8d4..902026f6b 100644
--- a/samples/scala/src/main/scala/org/teavm/samples/scala/Calculator.scala
+++ b/samples/scala/src/main/scala/org/teavm/samples/scala/Calculator.scala
@@ -52,7 +52,7 @@ object Calculator {
 
   def keyword(str: String) = s(str) ~ ws >> { case (s, _) => s }
 
-  def ws = s(" ").* >> (_ => Unit)
+  def ws = s(" ").* >> (_ => ())
 }
 
 sealed abstract class Expr