From 770b07d5d373bdec3c8dbcc359ad047cf8bef530 Mon Sep 17 00:00:00 2001
From: Justin Corn <60192848+justin-corn@users.noreply.github.com>
Date: Tue, 8 Nov 2022 12:54:39 -0800
Subject: [PATCH] Publish and use launcher assembly jar (#91)

* Publish and use launcher assembly jar

* Import PublishInfo
---
 .morphir-version | 2 +-
 build.sc         | 8 ++++++++
 launch           | 5 +++--
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/.morphir-version b/.morphir-version
index 484eb61cd..514fe9605 100644
--- a/.morphir-version
+++ b/.morphir-version
@@ -1 +1 @@
-0.1.1-M01
+0.1.1-M04
diff --git a/build.sc b/build.sc
index 9932a7420..b293587bf 100644
--- a/build.sc
+++ b/build.sc
@@ -15,6 +15,7 @@ import mill._, scalalib._, scalafmt._
 import mill.contrib.buildinfo.BuildInfo
 import mill.define.Sources
 import mill.modules.Jvm
+import mill.scalalib.publish.PublishInfo
 import os.Path
 
 import Deps._
@@ -239,6 +240,13 @@ object morphir extends Module {
         Map("version" -> maybeLastTaggedVersion.getOrElse("0.0.0"))
       }
       object test extends Tests with MorphirTestModule {}
+
+      // also publish the assembly jar
+      override def extraPublish: T[Seq[PublishInfo]] = T {
+        Seq(
+          PublishInfo(file = assembly(), classifier = Some("assembly"), ivyConfig = "compile")
+        )
+      }
     }
 
     object msc extends Module {
diff --git a/launch b/launch
index c88e77920..68d23053f 100755
--- a/launch
+++ b/launch
@@ -14,9 +14,10 @@
 set -euo pipefail
 #set -x
 
-FALLBACK_MORPHIR_VERSION=0.1.1-M01
+FALLBACK_MORPHIR_VERSION=0.1.1-M04
 MORPHIR_VERSION_FILE=.morphir-version
 CACHE_HOME="${XDG_CACHE_HOME:-$HOME/.cache}/morphir/launcher"
+URL_FMT=https://repo1.maven.org/maven2/org/finos/morphir/morphir-tools-launcher_2.13/%s/morphir-tools-launcher_2.13-%s-assembly.jar
 
 _log() {
     echo $* >/dev/stderr
@@ -74,7 +75,7 @@ curl_download() {
 launcher_jar_url() {
     local ver="$1"
 
-    echo https://repo1.maven.org/maven2/org/finos/morphir/morphir-tools-launcher_3/$ver/morphir-tools-launcher_3-$ver.jar
+    printf $URL_FMT $ver $ver
 }
 
 main() {