diff --git a/README.md b/README.md index b636cea..3d9fa1c 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ This is the Scala project you get if: ## Notes -### Why Scala 3.7.0-RC2? +### Why Scala 3.7.0? Because is the first Scala version shipping https://github.com/scala/scala3/pull/22632. The emitted Scala code is more compatible with Android ART. diff --git a/app/src/test/java/com/example/scala_3_android_java/ExampleUnitTest.java b/app/src/test/java/com/example/scala_3_android_java/ExampleUnitTest.java deleted file mode 100644 index 4a38b77..0000000 --- a/app/src/test/java/com/example/scala_3_android_java/ExampleUnitTest.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.example.scala_3_android_java; - -import org.junit.Test; - -import static org.junit.Assert.*; - -import com.example.core.Foo; - -import scala.jdk.javaapi.OptionConverters; - -/** - * Example local unit test, which will execute on the development machine (host). - * - * @see Testing documentation - */ -public class ExampleUnitTest { - @Test - public void addition_isCorrect() { - assertEquals(4, 2 + 2); - } - - @Test - public void integer_fromScalaCore() { - assertEquals(42, Foo.bar()); - } - - @Test - public void converted_option_fromScalaCore() { - assertEquals(42, OptionConverters.toJava(Foo.option()).get()); - } -} \ No newline at end of file diff --git a/app/src/test/scala/com/example/scala_3_android_java/ScalaUnitTest.scala b/app/src/test/scala/com/example/scala_3_android_java/ScalaUnitTest.scala new file mode 100644 index 0000000..f102855 --- /dev/null +++ b/app/src/test/scala/com/example/scala_3_android_java/ScalaUnitTest.scala @@ -0,0 +1,29 @@ +package com.example.scala_3_android_java + +import com.example.core.Foo +import org.junit.Test +import org.junit.Assert.* + +import scala.jdk.javaapi.OptionConverters + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ScalaUnitTest { + + @Test + def addition_isCorrect(): Unit = { + assertEquals(4, 2 + 2) + } + + @Test def integer_fromScalaCore(): Unit = { + assertEquals(42, Foo.bar) + } + + @Test def converted_option_fromScalaCore(): Unit = { + assertEquals(42, OptionConverters.toJava(Foo.option).get) + } + +} \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5fea18d..a2f8ad3 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -8,7 +8,7 @@ material = "1.12.0" constraintlayout = "2.2.1" lifecycleLivedataKtx = "2.8.7" lifecycleViewmodelKtx = "2.8.7" -scalaAndroidPlugin = "24.1019.1546" +scalaAndroidPlugin = "25.0412.2039" scala3Library_x = "3.7.0-RC2" [libraries] diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 39b6272..3d4ea3a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Sun Mar 09 20:26:37 CET 2025 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists