Skip to content
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 README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -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)
}

}
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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