diff --git a/.gitignore b/.gitignore index de3a3c2..17a0e16 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,7 @@ out/ .bsp .idea +.cursor +.metals +.vscode +generate.sh diff --git a/.mill-version b/.mill-version index ece61c6..a5ba932 100644 --- a/.mill-version +++ b/.mill-version @@ -1 +1 @@ -1.0.6 \ No newline at end of file +1.1.7 \ No newline at end of file diff --git a/build.mill.scala b/build.mill similarity index 94% rename from build.mill.scala rename to build.mill index 0ea7a92..68da617 100644 --- a/build.mill.scala +++ b/build.mill @@ -1,6 +1,6 @@ //| mvnDeps: -//| - io.github.alexarchambault.mill::mill-native-image::0.2.4 -//| - io.github.alexarchambault.mill::mill-native-image-upload:0.2.4 +//| - io.github.alexarchambault.mill::mill-native-image::0.2.6 +//| - io.github.alexarchambault.mill::mill-native-image-upload:0.2.6 //| - com.goyeau::mill-scalafix::0.6.0 //| - com.lumidion::sonatype-central-client-requests:0.6.0 package build @@ -22,7 +22,7 @@ object Deps { def bouncycastle = "1.84" def caseApp = "2.1.0" def coursierPublish = "0.4.4" - def coursierVersion = "2.1.25-M23" + def coursierVersion = "2.1.25-M25" def graalVmVersion = "22.3.1" def graalVmId = s"graalvm-java17:$graalVmVersion" def expecty = "0.17.1" @@ -94,9 +94,19 @@ trait CliNativeImage extends NativeImage { override def nativeImageMainClass: T[String] = Task { `native-cli`.mainClass().getOrElse(sys.error("no main class found")) } + private def bouncycastleRerunClasses: List[String] = List( + "org.bouncycastle.jcajce.provider.drbg.DRBG$Default", + "org.bouncycastle.jcajce.provider.drbg.DRBG$NonceAndIV", + "org.bouncycastle.jcajce.provider.drbg.DRBG", + "org.bouncycastle.jcajce.provider.drbg.EntropyDaemon", + "org.bouncycastle.crypto.CryptoServicesRegistrar", + "org.bouncycastle.crypto.macs.HMac", + "org.bouncycastle.util.Properties", + "org.bouncycastle.util.Strings" + ) override def nativeImageOptions: T[Seq[String]] = super.nativeImageOptions() ++ Seq( "--no-fallback", - "--rerun-class-initialization-at-runtime=org.bouncycastle.jcajce.provider.drbg.DRBG$Default,org.bouncycastle.jcajce.provider.drbg.DRBG$NonceAndIV" + s"--rerun-class-initialization-at-runtime=${bouncycastleRerunClasses.mkString(",")}" ) def nameSuffix = "" diff --git a/project/package.mill.scala b/project/package.mill similarity index 100% rename from project/package.mill.scala rename to project/package.mill diff --git a/project/publish/package.mill.scala b/project/publish/package.mill similarity index 97% rename from project/publish/package.mill.scala rename to project/publish/package.mill index ee07002..ed4f138 100644 --- a/project/publish/package.mill.scala +++ b/project/publish/package.mill @@ -1,5 +1,5 @@ package build.project.publish -import com.lumidion.sonatype.central.client.core.{PublishingType, SonatypeCredentials} +import mill.javalib.publish.{PublishingType, SonatypeCredentials} import mill._ import mill.util.VcsVersion