File tree Expand file tree Collapse file tree 7 files changed +28
-33
lines changed Expand file tree Collapse file tree 7 files changed +28
-33
lines changed Original file line number Diff line number Diff line change @@ -18,16 +18,18 @@ jobs:
18
18
strategy :
19
19
fail-fast : false
20
20
matrix :
21
- os : [ubuntu-20 .04, macos-12 ]
21
+ os : [ubuntu-22 .04, macos-13 ]
22
22
runs-on : ${{ matrix.os }}
23
23
steps :
24
- - uses : actions/checkout@v3
24
+ - uses : actions/checkout@v4
25
25
26
- - uses : actions/setup-java@v3
26
+ - uses : actions/setup-java@v4
27
27
with :
28
28
distribution : ' temurin'
29
29
java-version : 17
30
30
cache : sbt
31
+
32
+ - uses : sbt/setup-sbt@v1
31
33
32
34
- name : Tests
33
35
run : sbt test pluginTests checkDocs publishLocal versionDump
@@ -47,11 +49,11 @@ jobs:
47
49
48
50
- name : Run example
49
51
env :
50
- LLVM_BIN : /usr/local/opt/llvm@14 /bin
52
+ LLVM_BIN : /usr/local/opt/llvm@17 /bin
51
53
if : startsWith(matrix.os, 'macos-')
52
54
run : |
53
55
set -e
54
- brew install llvm@14
56
+ brew install llvm@17
55
57
cd example
56
58
SBT_VCPKG_VERSION=$(cat ../version) sbt example/run
57
59
98
100
- name : Install pkg-config on Windows
99
101
run : choco install pkgconfiglite
100
102
101
- - uses : actions/checkout@v3
103
+ - uses : actions/checkout@v4
102
104
103
- - uses : actions/setup-java@v3
105
+ - uses : actions/setup-java@v4
104
106
with :
105
107
distribution : ' temurin'
106
108
java-version : 17
Original file line number Diff line number Diff line change 1
- FROM eclipse-temurin:17-focal
1
+ FROM eclipse-temurin:21-jammy
2
2
3
3
RUN apt update && apt install -y curl && \
4
- curl -Lo /usr/local/bin/sbt https://raw.githubusercontent.com/sbt/sbt/1.8 .x/sbt && \
4
+ curl -Lo /usr/local/bin/sbt https://raw.githubusercontent.com/sbt/sbt/1.10 .x/sbt && \
5
5
chmod +x /usr/local/bin/sbt && \
6
6
curl -Lo llvm.sh https://apt.llvm.org/llvm.sh && \
7
7
chmod +x llvm.sh && \
8
8
apt install -y lsb-release wget software-properties-common gnupg && \
9
- ./llvm.sh 14 && \
9
+ ./llvm.sh 17 && \
10
10
apt update && \
11
- apt install -y zip unzip tar make cmake autoconf pkg-config
11
+ apt install -y zip unzip tar make cmake autoconf pkg-config git
12
12
13
13
COPY . /sources
14
14
15
- RUN apt install -y git
16
-
17
- ENV LLVM_BIN "/usr/lib/llvm-14/bin"
18
- ENV CC "/usr/lib/llvm-14/bin/clang"
15
+ ENV LLVM_BIN "/usr/lib/llvm-17/bin"
16
+ ENV CC "/usr/lib/llvm-17/bin/clang"
19
17
ENV PATH="${PATH}:/root/.local/share/coursier/bin"
20
18
21
19
ENV SBT_VCPKG_VERSION dev
Original file line number Diff line number Diff line change
1
+ version = "3.7.15"
2
+ runner.dialect = scala213
Original file line number Diff line number Diff line change @@ -9,7 +9,7 @@ vcpkgDependencies := VcpkgDependencies(
9
9
10
10
resolvers += Resolver .sonatypeRepo(" snapshots" )
11
11
12
- scalaVersion := " 3.2.2 "
12
+ scalaVersion := " 3.6.3 "
13
13
14
14
import bindgen .interface .Binding
15
15
@@ -22,28 +22,22 @@ vcpkgNativeConfig ~= {
22
22
bindgenBindings := {
23
23
val configurator = vcpkgConfigurator.value
24
24
Seq (
25
- Binding
26
- .builder(configurator.includes(" cjson" ) / " cjson" / " cJSON.h" , " cjson" )
27
- .withCImports(List (" cJSON.h" ))
28
- .build,
29
- Binding
30
- .builder(configurator.includes(" libuv" ) / " uv.h" , " libuv" )
25
+ Binding (configurator.includes(" cjson" ) / " cjson" / " cJSON.h" , " cjson" )
26
+ .withCImports(List (" cJSON.h" )),
27
+ Binding (configurator.includes(" libuv" ) / " uv.h" , " libuv" )
31
28
.withCImports(List (" uv.h" ))
32
29
.withClangFlags(
33
30
List (
34
31
" -I" + configurator.includes(" libuv" ).toString
35
32
)
36
- )
37
- .build,
38
- Binding
39
- .builder(configurator.includes(" czmq" ) / " czmq.h" , " czmq" )
33
+ ),
34
+ Binding (configurator.includes(" czmq" ) / " czmq.h" , " czmq" )
40
35
.withCImports(List (" czmq.h" ))
41
36
.withClangFlags(
42
37
List (
43
38
" -I" + configurator.includes(" czmq" ).toString,
44
39
" -I" + configurator.includes(" zeromq" ).toString
45
40
)
46
41
)
47
- .build
48
42
)
49
43
}
Original file line number Diff line number Diff line change 1
- sbt.version =1.9.4
1
+ sbt.version =1.10.10
Original file line number Diff line number Diff line change 1
1
val BindgenVersion =
2
- sys.env.getOrElse(" SN_BINDGEN_VERSION" , " 0.0.16 " )
2
+ sys.env.getOrElse(" SN_BINDGEN_VERSION" , " 0.2.3 " )
3
3
4
4
val VcpkgVersion =
5
- sys.env.getOrElse(" SBT_VCPKG_VERSION" , " 0.0.9 " )
5
+ sys.env.getOrElse(" SBT_VCPKG_VERSION" , " 0.0.21 " )
6
6
7
7
addSbtPlugin(" com.indoorvivants" % " bindgen-sbt-plugin" % BindgenVersion )
8
- addSbtPlugin(" org.scala-native" % " sbt-scala-native" % " 0.4 .7" )
8
+ addSbtPlugin(" org.scala-native" % " sbt-scala-native" % " 0.5 .7" )
9
9
addSbtPlugin(" com.indoorvivants.vcpkg" % " sbt-vcpkg-native" % VcpkgVersion )
10
10
11
11
resolvers += Resolver .sonatypeRepo(" snapshots" )
Original file line number Diff line number Diff line change @@ -12,7 +12,7 @@ import libuv.types.*
12
12
import scalanative .unsigned .*
13
13
14
14
@ main def hello =
15
- Zone { implicit z =>
15
+ Zone :
16
16
val loop = uv_default_loop()
17
17
18
18
uv_loop_init(loop)
@@ -41,4 +41,3 @@ import scalanative.unsigned.*
41
41
uv_run(loop, uv_run_mode.UV_RUN_DEFAULT )
42
42
43
43
uv_loop_close(loop)
44
- }
You can’t perform that action at this time.
0 commit comments