From 1e23e17e1023760ec44469dc1e541fc7fcc9df77 Mon Sep 17 00:00:00 2001
From: Piotr Chabelski <ged.subfan@gmail.com>
Date: Wed, 27 Nov 2024 12:11:33 +0100
Subject: [PATCH] Update `scala-packager` to 0.1.31 (#3311)

---
 DEV.md                                        |  2 ++
 .../scala-cli-core/reflect-config.json        | 30 +++++++++++++++++++
 .../cli/integration/NativePackagerTests.scala |  3 +-
 project/deps.sc                               |  2 +-
 4 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/DEV.md b/DEV.md
index a088bfc08e..a4b0d6e961 100644
--- a/DEV.md
+++ b/DEV.md
@@ -186,6 +186,8 @@ Here's some of the more important external projects used by Scala CLI:
   Scala.js linker
 - [scala-cli-signing](https://github.com/VirtusLab/scala-cli-signing): provides both libraries and binaries to handle
   PGP concerns in Scala CLI
+- [scala-packager](https://github.com/VirtusLab/scala-packager): provides a library to package applications 
+  in native formats
 - [libsodiumjni](https://github.com/VirtusLab/libsodiumjni): provides minimal JNI bindings for
   [libsodium](https://github.com/jedisct1/libsodium), that is used by Scala CLI to encrypt secrets
   uploaded as GitHub repository secrets in the `publish setup` sub-command
diff --git a/modules/cli/src/main/resources/META-INF/native-image/org.virtuslab/scala-cli-core/reflect-config.json b/modules/cli/src/main/resources/META-INF/native-image/org.virtuslab/scala-cli-core/reflect-config.json
index 4d4f55f517..a599b425c7 100644
--- a/modules/cli/src/main/resources/META-INF/native-image/org.virtuslab/scala-cli-core/reflect-config.json
+++ b/modules/cli/src/main/resources/META-INF/native-image/org.virtuslab/scala-cli-core/reflect-config.json
@@ -812,6 +812,12 @@
     "name": "com.google.api.client.util.GenericData",
     "allDeclaredFields": true
   },
+  {
+    "name": "com.google.cloud.tools.jib.api.DockerInfoDetails",
+    "allDeclaredFields": true,
+    "allDeclaredMethods": true,
+    "allDeclaredConstructors": true
+  },
   {
     "name": "com.google.cloud.tools.jib.cache.LayerEntriesSelector$LayerEntryTemplate",
     "allDeclaredFields": true,
@@ -898,6 +904,30 @@
     "name": "com.google.cloud.tools.jib.image.json.ManifestTemplate",
     "allDeclaredMethods": true
   },
+  {
+    "name": "com.google.cloud.tools.jib.image.json.OciIndexTemplate",
+    "allDeclaredFields": true,
+    "allDeclaredMethods": true,
+    "allDeclaredConstructors": true
+  },
+  {
+    "name": "com.google.cloud.tools.jib.image.json.OciIndexTemplate$ManifestDescriptorTemplate",
+    "allDeclaredFields": true,
+    "allDeclaredMethods": true,
+    "allDeclaredConstructors": true
+  },
+  {
+    "name": "com.google.cloud.tools.jib.image.json.OciIndexTemplate$ManifestDescriptorTemplate$Platform",
+    "allDeclaredFields": true,
+    "allDeclaredMethods": true,
+    "allDeclaredConstructors": true
+  },
+  {
+    "name": "com.google.cloud.tools.jib.image.json.OciManifestTemplate",
+    "allDeclaredFields": true,
+    "allDeclaredMethods": true,
+    "allDeclaredConstructors": true
+  },
   {
     "name": "com.google.cloud.tools.jib.image.json.V22ManifestListTemplate",
     "allDeclaredFields": true,
diff --git a/modules/integration/src/test/scala/scala/cli/integration/NativePackagerTests.scala b/modules/integration/src/test/scala/scala/cli/integration/NativePackagerTests.scala
index 8767b06545..43f645b37b 100644
--- a/modules/integration/src/test/scala/scala/cli/integration/NativePackagerTests.scala
+++ b/modules/integration/src/test/scala/scala/cli/integration/NativePackagerTests.scala
@@ -430,8 +430,7 @@ class NativePackagerTests extends ScalaCliSuite {
   }
 
   if (Properties.isLinux)
-    // FIXME make this test pass consistently on the CI again
-    test("building docker image with scala native app".flaky) {
+    test("building docker image with scala native app") {
       TestUtil.retryOnCi() {
         runNativeTest()
       }
diff --git a/project/deps.sc b/project/deps.sc
index 02998fe1ff..2e408ce51e 100644
--- a/project/deps.sc
+++ b/project/deps.sc
@@ -120,7 +120,7 @@ object Deps {
     def maxScalaNativeForTypelevelToolkit = scalaNative04
     def maxScalaNativeForScalaPy          = scalaNative04
     def maxScalaNativeForMillExport       = scalaNative04
-    def scalaPackager                     = "0.1.29"
+    def scalaPackager                     = "0.1.31"
     def signingCli                        = "0.2.4"
     def signingCliJvmVersion              = Java.defaultJava
     def javaSemanticdb                    = "0.10.0"