Skip to content

Commit 1e23e17

Browse files
authored
Update scala-packager to 0.1.31 (#3311)
1 parent cba8f54 commit 1e23e17

File tree

4 files changed

+34
-3
lines changed

4 files changed

+34
-3
lines changed

DEV.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,8 @@ Here's some of the more important external projects used by Scala CLI:
186186
Scala.js linker
187187
- [scala-cli-signing](https://github.com/VirtusLab/scala-cli-signing): provides both libraries and binaries to handle
188188
PGP concerns in Scala CLI
189+
- [scala-packager](https://github.com/VirtusLab/scala-packager): provides a library to package applications
190+
in native formats
189191
- [libsodiumjni](https://github.com/VirtusLab/libsodiumjni): provides minimal JNI bindings for
190192
[libsodium](https://github.com/jedisct1/libsodium), that is used by Scala CLI to encrypt secrets
191193
uploaded as GitHub repository secrets in the `publish setup` sub-command

modules/cli/src/main/resources/META-INF/native-image/org.virtuslab/scala-cli-core/reflect-config.json

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -812,6 +812,12 @@
812812
"name": "com.google.api.client.util.GenericData",
813813
"allDeclaredFields": true
814814
},
815+
{
816+
"name": "com.google.cloud.tools.jib.api.DockerInfoDetails",
817+
"allDeclaredFields": true,
818+
"allDeclaredMethods": true,
819+
"allDeclaredConstructors": true
820+
},
815821
{
816822
"name": "com.google.cloud.tools.jib.cache.LayerEntriesSelector$LayerEntryTemplate",
817823
"allDeclaredFields": true,
@@ -898,6 +904,30 @@
898904
"name": "com.google.cloud.tools.jib.image.json.ManifestTemplate",
899905
"allDeclaredMethods": true
900906
},
907+
{
908+
"name": "com.google.cloud.tools.jib.image.json.OciIndexTemplate",
909+
"allDeclaredFields": true,
910+
"allDeclaredMethods": true,
911+
"allDeclaredConstructors": true
912+
},
913+
{
914+
"name": "com.google.cloud.tools.jib.image.json.OciIndexTemplate$ManifestDescriptorTemplate",
915+
"allDeclaredFields": true,
916+
"allDeclaredMethods": true,
917+
"allDeclaredConstructors": true
918+
},
919+
{
920+
"name": "com.google.cloud.tools.jib.image.json.OciIndexTemplate$ManifestDescriptorTemplate$Platform",
921+
"allDeclaredFields": true,
922+
"allDeclaredMethods": true,
923+
"allDeclaredConstructors": true
924+
},
925+
{
926+
"name": "com.google.cloud.tools.jib.image.json.OciManifestTemplate",
927+
"allDeclaredFields": true,
928+
"allDeclaredMethods": true,
929+
"allDeclaredConstructors": true
930+
},
901931
{
902932
"name": "com.google.cloud.tools.jib.image.json.V22ManifestListTemplate",
903933
"allDeclaredFields": true,

modules/integration/src/test/scala/scala/cli/integration/NativePackagerTests.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -430,8 +430,7 @@ class NativePackagerTests extends ScalaCliSuite {
430430
}
431431

432432
if (Properties.isLinux)
433-
// FIXME make this test pass consistently on the CI again
434-
test("building docker image with scala native app".flaky) {
433+
test("building docker image with scala native app") {
435434
TestUtil.retryOnCi() {
436435
runNativeTest()
437436
}

project/deps.sc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ object Deps {
120120
def maxScalaNativeForTypelevelToolkit = scalaNative04
121121
def maxScalaNativeForScalaPy = scalaNative04
122122
def maxScalaNativeForMillExport = scalaNative04
123-
def scalaPackager = "0.1.29"
123+
def scalaPackager = "0.1.31"
124124
def signingCli = "0.2.4"
125125
def signingCliJvmVersion = Java.defaultJava
126126
def javaSemanticdb = "0.10.0"

0 commit comments

Comments
 (0)