Skip to content

Commit e406f8a

Browse files
authored
Merge pull request #33 from Quafadas/scala3.7.0
test scala 3.7.0
2 parents 9d47508 + d031498 commit e406f8a

File tree

9 files changed

+13
-21
lines changed

9 files changed

+13
-21
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,13 @@ jobs:
2727
fetch-depth: 0
2828
fetch-tags: true
2929
- uses: coursier/cache-action@v6.4
30+
- name: Compile
31+
run: ./mill __.compile
32+
- name: test
33+
run: ./mill scautable.jvm.test
3034
- name: Run tests
31-
run: ./mill -i __.publishArtifacts + __.test
35+
run: ./mill -i __.publishArtifacts
36+
3237

3338
publish:
3439
if: github.repository == 'Quafadas/scautable' && contains(github.ref, 'refs/tags/')

build.mill

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ import mill.api.Result
1616

1717
// mill --import ivy:com.lihaoyi::mill-contrib-bloop: mill.contrib.bloop.Bloop/install
1818
trait Common extends ScalaModule with PublishModule {
19-
def scalaVersion = "3.6.3"
19+
def scalaVersion = "3.7.0-RC1"
2020

2121
override def ivyDeps = super.ivyDeps() ++ Agg(
2222
ivy"com.lihaoyi::scalatags::0.13.1",
2323
ivy"com.lihaoyi::os-lib:0.11.4",
2424
ivy"com.lihaoyi::fansi::0.5.0"
2525
)
26-
override def scalacOptions: T[Seq[String]] = super.scalacOptions() ++ Seq("-experimental", "-language:experimental.namedTuples", "-Xmax-inlines", "128")
26+
override def scalacOptions: T[Seq[String]] = super.scalacOptions() ++ Seq("-Xmax-inlines", "128")
2727

2828
def publishVersion = VcsVersion.vcsState().format()
2929

scautable/src/columnExtensions.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package io.github.quafadas.scautable
22

33
import scala.quoted.*
44
import scala.io.Source
5-
import scala.annotation.experimental
65
import NamedTuple.withNames
76
import scala.NamedTuple.*
87
import scala.collection.immutable.Stream.Empty

scautable/src/columnType.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@ package io.github.quafadas.scautable
22

33
import scala.compiletime.*
44
import scala.compiletime.ops.int.*
5-
import scala.annotation.experimental
65

7-
@experimental
86
object ColumnTyped:
97

108
inline def constValueAll[A]: A =

scautable/src/consoleFormat.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,11 @@ import fansi.Str
44
import scala.NamedTuple
55
import scala.NamedTuple.*
66
import scala.compiletime.constValueTuple
7-
import scala.annotation.experimental
87
import scala.math.Numeric.Implicits.*
98
import fansi.EscapeAttr
109
import scala.util.NotGiven
1110

12-
@experimental
11+
1312
object ConsoleFormat:
1413

1514
extension (s: Seq[Product])

scautable/src/csv.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package io.github.quafadas.scautable
22

33
import scala.quoted.*
44
import scala.io.Source
5-
import scala.annotation.experimental
65
import NamedTuple.withNames
76
import scala.NamedTuple.*
87
import scala.collection.immutable.Stream.Empty
@@ -18,7 +17,6 @@ import ColumnTyped.*
1817
import scala.math.Fractional.Implicits.*
1918
import scala.collection.View.Single
2019

21-
@experimental
2220
object CSV:
2321

2422
transparent inline def url[T](inline path: String) = ${ readCsvFromUrl('path) }

scautable/test/jvm/src/extend.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,9 @@ package io.github.quafadas.scautable
33
import io.github.quafadas.table.*
44
import java.time.LocalDate
55
import scalatags.Text.all.*
6-
import scala.annotation.experimental
76
import NamedTuple.*
87
import scala.compiletime.ops.int.S
98

10-
@experimental
119
class ExtendSuite extends munit.FunSuite:
1210

1311
import scautable.*

scautable/test/jvm/src/testCsv.scala

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
package io.github.quafadas.scautable
22

33
import java.time.LocalDate
4-
5-
import scala.annotation.experimental
64
import io.github.quafadas.table.*
75

86
import NamedTuple.*
97

108
import scala.compiletime.ops.int.S
119

12-
@experimental
1310
class CSVSuite extends munit.FunSuite:
1411

1512
test("type test") {
@@ -96,10 +93,10 @@ class CSVSuite extends munit.FunSuite:
9693

9794
def selectCols: Iterator[(col1: Int, col3: String)] = cols.columns[("col1", "col3")]
9895

99-
assert(cols.toArray().head.col1 == 1)
100-
assert(cols.toArray().head.col3 == "7")
101-
assert(cols.toArray().last.col1 == 5)
102-
assert(cols.toArray().last.col3 == "9")
96+
assert(cols.toArray.head.col1 == 1)
97+
assert(cols.toArray.head.col3 == "7")
98+
assert(cols.toArray.last.col1 == 5)
99+
assert(cols.toArray.last.col3 == "9")
103100

104101
def numerics: Iterator[(col1: Int)] = cols.numericCols
105102
def nonnumerics: Iterator[(col2: String, col3: String)] = cols.nonNumericCols

scautable/test/jvm/src/testExcel.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,11 @@ package io.github.quafadas.scautable
33
import io.github.quafadas.table.*
44
import java.time.LocalDate
55

6-
import scala.annotation.experimental
76
import NamedTuple.*
87
import scala.compiletime.ops.int.S
98

109
import Excel.BadTableException
1110

12-
@experimental
1311
class ExcelSuite extends munit.FunSuite:
1412

1513
test("excel provider compiles and typechecks") {

0 commit comments

Comments
 (0)