Skip to content

Commit 2e2237c

Browse files
committed
Update CI
1 parent e3d0097 commit 2e2237c

File tree

9 files changed

+28
-25
lines changed

9 files changed

+28
-25
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ jobs:
2626
- name: Set up Python ${{ matrix.python }}
2727
uses: actions/setup-python@v2
2828
with:
29-
python: ${{ matrix.python }}
29+
python-version: ${{ matrix.python }}
3030
- name: Unit tests
3131
run: sbt +test
3232
shell: bash
3333
- name: Integration tests again latest ScalaPy stable
34-
run: scripts/integration_test.sh python3 0.5.0
34+
run: scripts/integration_test.sh python3 0.5.1
3535
shell: bash
3636
- name: Test virtualenv
37-
run: scripts/virtualenv_test.sh 0.5.0+8-7c7a6042
37+
run: scripts/virtualenv_test.sh 0.5.1

.scalafmt.conf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
version = "2.7.5"
1+
version = "3.0.5"
22
align.preset = more
33
maxColumn = 100
4+
runner.dialect = scala213source3

build.sbt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import Dependencies._
33
inThisBuild(
44
List(
55
organization := "ai.kien",
6-
homepage := Some(url("https://github.com/kiendang/python-native-libs")),
7-
licenses := List("BSD-3-Clause" -> url("https://opensource.org/licenses/BSD-3-Clause")),
6+
homepage := Some(url("https://github.com/kiendang/python-native-libs")),
7+
licenses := List("BSD-3-Clause" -> url("https://opensource.org/licenses/BSD-3-Clause")),
88
developers := List(
99
Developer(
1010
"kiendang",
@@ -16,11 +16,11 @@ inThisBuild(
1616
)
1717
)
1818

19-
lazy val scala212 = "2.12.14"
20-
lazy val scala213 = "2.13.6"
21-
lazy val scala3 = "3.0.0"
19+
lazy val scala212 = "2.12.15"
20+
lazy val scala213 = "2.13.7"
21+
lazy val scala3 = "3.1.0"
2222

23-
lazy val scalapyVersion = getProp("plugin.scalapy.version").getOrElse("0.5.0")
23+
lazy val scalapyVersion = getProp("plugin.scalapy.version").getOrElse("0.5.1")
2424

2525
lazy val enableScripted = getProp("plugin.ci").isDefined
2626

@@ -59,17 +59,17 @@ def scriptedSettings = if (enableScripted) {
5959
lazy val root = (project in file("."))
6060
.enablePlugins(scriptedPlugin: _*)
6161
.settings(
62-
name := "Python Native Libs",
62+
name := "Python Native Libs",
6363
crossScalaVersions := Seq(scala212, scala213, scala3),
6464
libraryDependencies ++= Seq(
6565
scalaCollectionCompat,
6666
scalaTest % Test,
6767
jimfs % Test
6868
),
6969
sonatypeCredentialHost := "s01.oss.sonatype.org",
70-
sonatypeRepository := "https://s01.oss.sonatype.org/service/local",
71-
semanticdbEnabled := true,
72-
semanticdbVersion := scalafixSemanticdb.revision,
70+
sonatypeRepository := "https://s01.oss.sonatype.org/service/local",
71+
semanticdbEnabled := true,
72+
semanticdbVersion := scalafixSemanticdb.revision,
7373
scalacOptions ++= warnUnusedImports(scalaVersion.value)
7474
)
7575
.settings(scriptedSettings)

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.5.5
1+
sbt.version=1.6.1

project/metals.sbt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
// DO NOT EDIT! This file is auto-generated.
2+
23
// This file enables sbt-bloop to create bloop config files.
34

4-
addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.4.8-19-4d9f966b")
5+
addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.4.11")
6+

project/plugins.sbt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.2.21")
2-
addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7")
3-
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.29")
1+
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.2.24")
2+
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.9")
3+
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.34")

src/sbt-test/integration/scalapy/build.sbt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import ai.kien.python.Python
22

3-
lazy val scala212 = "2.12.14"
3+
lazy val scala212 = "2.12.15"
44
lazy val scala213 = "2.13.6"
5-
lazy val scala3 = "3.0.0"
5+
lazy val scala3 = "3.1.0"
66

77
ThisBuild / scalaVersion := scala213
88

@@ -28,7 +28,7 @@ val checkModule = taskKey[Unit]("Check loading a dummy module")
2828
lazy val root = crossProject(JVMPlatform, NativePlatform)
2929
.in(file("."))
3030
.settings(
31-
crossScalaVersions := Seq(scala212, scala213),
31+
crossScalaVersions := Seq(scala212, scala213),
3232
Compile / mainClass := Some("project.Main")
3333
)
3434
.jvmSettings(
@@ -41,6 +41,6 @@ lazy val root = crossProject(JVMPlatform, NativePlatform)
4141
)
4242
.nativeSettings(
4343
libraryDependencies += "me.shadaj" %%% "scalapy-core" % scalapyVersion,
44-
nativeLinkStubs := true,
44+
nativeLinkStubs := true,
4545
nativeLinkingOptions ++= pythonLdFlags
4646
)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.5.5
1+
sbt.version=1.6.1

src/sbt-test/integration/scalapy/project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.1.0")
2-
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.0")
2+
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.2")
33

44
sys.props.get("plugin.version") match {
55
case Some(v) => libraryDependencies += "ai.kien" %% "python-native-libs" % v

0 commit comments

Comments
 (0)