Skip to content

Commit 346bc7b

Browse files
committed
PR updates
1 parent f8535e1 commit 346bc7b

2 files changed

Lines changed: 13 additions & 10 deletions

File tree

buildSrc/src/main/kotlin/project/scala.gradle.kts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ afterEvaluate {
6565
// ============================================
6666
// Scala version specific configuration
6767
// ============================================
68-
val compileOptions = mutableListOf("-target:jvm-1.8")
68+
val compileOptions: MutableList<String> = mutableListOf()
6969
when (scalaVersion) {
7070
"3" -> {
7171
dependencies {
@@ -76,7 +76,7 @@ afterEvaluate {
7676
sourceSets { main { scala { setSrcDirs(listOf("src/main/scala", "src/main/scala-3")) } } }
7777
sourceSets { test { scala { setSrcDirs(listOf("src/test/scala", "src/test/scala-3")) } } }
7878

79-
compileOptions.addAll(listOf("-Xcheck-macros", "-Ycheck:all"))
79+
compileOptions.addAll(listOf("-release:8", "-Xcheck-macros", "-Ycheck:all"))
8080
}
8181
"2.13" -> {
8282
dependencies {
@@ -89,6 +89,7 @@ afterEvaluate {
8989

9090
compileOptions.addAll(
9191
listOf(
92+
"-release:8",
9293
"-feature",
9394
"-unchecked",
9495
"-language:reflectiveCalls",
@@ -103,6 +104,8 @@ afterEvaluate {
103104
}
104105
sourceSets { main { scala { setSrcDirs(listOf("src/main/scala", "src/main/scala-2", "src/main/scala-2.13-")) } } }
105106
sourceSets { test { scala { setSrcDirs(listOf("src/test/scala", "src/test/scala-2", "src/test/scala-2.13-")) } } }
107+
108+
compileOptions.add("-target:jvm-1.8")
106109
}
107110
"2.11" -> {
108111
dependencies {
@@ -114,7 +117,7 @@ afterEvaluate {
114117
sourceSets { main { scala { setSrcDirs(listOf("src/main/scala", "src/main/scala-2", "src/main/scala-2.13-")) } } }
115118
sourceSets { test { scala { setSrcDirs(listOf("src/test/scala", "src/test/scala-2", "src/test/scala-2.13-")) } } }
116119

117-
compileOptions.add("-Xexperimental")
120+
compileOptions.addAll(listOf("-target:jvm-1.8","-Xexperimental"))
118121
}
119122
}
120123

driver-scala/README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
# Mongo Scala Driver
22

3-
The `driver-scala` provides provides Scala-idiomatic wrappers for the Mongo Reactive Streams driver.
3+
The `driver-scala` provides Scala-idiomatic wrappers for the Mongo Reactive Streams driver.
44
It currently supports: **Scala 2.11**, **Scala 2.12**, **Scala 2.13**, and **Scala 3**.
55

66
## Scala Versions
77

8-
Supported Scala versions and their exact version numbers are defined in [`gradle.properties`](gradle.properties):
8+
Supported Scala versions and their exact version numbers are defined in [`gradle.properties`](../gradle.properties):
99

1010
- `supportedScalaVersions` — the list of supported Scala versions
1111
- `defaultScalaVersion` — the version used when no `-PscalaVersion` flag is provided (currently `2.13`)
1212

1313
## Build Configuration
1414

15-
The Scala source set configuration, compiler options, and dependency wiring are all handled in [`buildSrc/src/main/kotlin/project/scala.gradle.kts`](buildSrc/src/main/kotlin/project/scala.gradle.kts).
15+
The Scala source set configuration, compiler options, and dependency wiring are all handled in [`buildSrc/src/main/kotlin/project/scala.gradle.kts`](../buildSrc/src/main/kotlin/project/scala.gradle.kts).
1616

1717
## Library Dependencies
1818

19-
Scala library and test dependencies for each version are defined in [`gradle/libs.versions.toml`](gradle/libs.versions.toml). Look for entries prefixed with `scala-` in the `[versions]`, `[libraries]`, and `[bundles]` sections.
19+
Scala library and test dependencies for each version are defined in [`gradle/libs.versions.toml`](../gradle/libs.versions.toml). Look for entries prefixed with `scala-` in the `[versions]`, `[libraries]`, and `[bundles]` sections.
2020

2121
## Directory Layout
2222

@@ -33,7 +33,7 @@ src/main/
3333
```
3434

3535
Test code also supports the same directory structure.
36-
The source sets for each Scala version are configured in [`buildSrc/src/main/kotlin/project/scala.gradle.kts`](buildSrc/src/main/kotlin/project/scala.gradle.kts).
36+
The source sets for each Scala version are configured in [`buildSrc/src/main/kotlin/project/scala.gradle.kts`](../buildSrc/src/main/kotlin/project/scala.gradle.kts).
3737
When adding new code, place it in the most general directory that applies. Only use a version-specific directory when the code requires syntax or APIs unique to that version.
3838

3939

@@ -69,6 +69,6 @@ By default, tests run against Scala 2.13. To test against a specific Scala versi
6969
# Test driver-scala with Scala 2.12
7070
./gradlew :driver-scala:scalaCheck -PscalaVersion=2.12
7171

72-
# Test driver-scala with the default (2.13)
73-
./gradlew :driver-scala:scalaCheck
72+
# Test driver-scala with the default (2.13) against Java 8
73+
./gradlew :driver-scala:scalaCheck -PjavaVersion=8
7474
```

0 commit comments

Comments
 (0)