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 .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- uses: coursier/setup-action@v1
with:
jvm: ${{ matrix.jdk }}
apps: sbtn
apps: sbtn sbt
- name: Set up Python ${{ matrix.python }}
uses: actions/setup-python@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = "3.4.3"
version = "3.10.1"
align.preset = more
maxColumn = 100
runner.dialect = scala213source3
17 changes: 9 additions & 8 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ inThisBuild(
organization := "ai.kien",
homepage := Some(url("https://github.com/kiendang/python-native-libs")),
licenses := List("BSD-3-Clause" -> url("https://opensource.org/licenses/BSD-3-Clause")),
developers := List(
developers := List(
Developer(
"kiendang",
"Dang Trung Kien",
Expand All @@ -16,9 +16,9 @@ inThisBuild(
)
)

lazy val scala212 = "2.12.15"
lazy val scala213 = "2.13.6"
lazy val scala3 = "3.0.2"
lazy val scala212 = "2.12.20"
lazy val scala213 = "2.13.17"
lazy val scala3 = "3.3.7"

ThisBuild / scalaVersion := scala213
ThisBuild / scalafixDependencies += organizeImports
Expand Down Expand Up @@ -46,10 +46,11 @@ lazy val root = project
}
}
)
.settings(
sonatypeCredentialHost := "s01.oss.sonatype.org",
sonatypeRepository := "https://s01.oss.sonatype.org/service/local"
)
// TODO: reconfigure sonatype publishing
// .settings(
// sonatypeCredentialHost := "s01.oss.sonatype.org",
// sonatypeRepository := "https://s01.oss.sonatype.org/service/local"
// )

lazy val docs = project
.in(file("python-docs"))
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.7.1
sbt.version=1.11.7
6 changes: 3 additions & 3 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.3")
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.10")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.10.1")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.8.0")
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.11.2")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.14.4")
4 changes: 2 additions & 2 deletions src/main/scala/ai/kien/python/Python.scala
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ class Python private[python] (
rawLdflags <- rawLdflags
nativeLibraryPaths <- nativeLibraryPaths
libPathFlags = nativeLibraryPaths.map("-L" + _)
flags = rawLdflags
flags = rawLdflags
.split("\\s+(?=-)")
.filter(f => f.nonEmpty && !libPathFlags.contains(f))
.flatMap(f => if (f.startsWith("-L")) Array(f) else f.split("\\s+"))
Expand All @@ -107,7 +107,7 @@ class Python private[python] (

private def existsInPath(exec: String): Boolean = {
val pathExts = getEnv("PATHEXT").getOrElse("").split(pathSeparator)
val l = for {
val l = for {
elem <- path.split(pathSeparator).iterator
elemPath = fs.getPath(elem)
ext <- pathExts.iterator
Expand Down
Loading