pls

bitcoin-s · Jun 1, 2021 · 72f1b38 · 72f1b38
1 parent 4fe038d
commit 72f1b38
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 10 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -19,15 +19,15 @@ jobs:
       - uses: olafurpg/setup-scala@v10
         with:
           java-version: zulu@1.11
-      - uses: olafurpg/setup-gpg@v3
-      - run: sbt ci-release docs/publishWebsite
-        env:
-          PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
-          PGP_SECRET: ${{ secrets.PGP_SECRET }}
-          SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
-          SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
-          GITHUB_DEPLOY_KEY: ${{ secrets.GITHUB_TOKEN }}
-          GIT_DEPLOY_KEY: ${{ secrets.GIT_DEPLOY_KEY }}
+#      - uses: olafurpg/setup-gpg@v3
+#      - run: sbt ci-release docs/publishWebsite
+#        env:
+#          PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
+#          PGP_SECRET: ${{ secrets.PGP_SECRET }}
+#          SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
+#          SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
+#          GITHUB_DEPLOY_KEY: ${{ secrets.GITHUB_TOKEN }}
+#          GIT_DEPLOY_KEY: ${{ secrets.GIT_DEPLOY_KEY }}
   osx:
     runs-on: [ macos-latest ]
     steps:

diff --git a/app/bundle/bundle.sbt b/app/bundle/bundle.sbt
@@ -16,7 +16,7 @@ assembly / mainClass := Some("org.bitcoins.bundle.gui.BundleGUI")
 
 assembly / assemblyJarName := s"${name.value}.jar"
 
-//need compatability with windows versioning scheme which is
+//need compatibility with windows versioning scheme which is
 //w.x.y.z
 Windows / version := previousStableVersion.value.get
 
@@ -47,3 +47,19 @@ wixFeatures += WindowsFeature(
     AddShortCuts(Seq("bin/bitcoin-s-bundle.bat"))
   )
 )
+
+// for windows class paths being too long
+scriptClasspath := Seq("*")
+
+Universal / mappings += {
+  // we are using the reference.conf as default application.conf
+  // the user can override settings here
+  val conf = (Compile / resourceDirectory).value / "application.conf"
+  conf -> "conf/application.conf"
+}
+
+scriptClasspath += "../conf/application.conf"
+
+// add jvm parameter for typesafe config
+bashScriptExtraDefines += """addJava "-Dconfig.file=${app_home}/../conf/application.conf""""
+batScriptExtraDefines += """call :add_java "-Dconfig.file=%APP_HOME%\conf\application.conf""""