Skip to content

Commit

Permalink
Merge pull request #94 from eed3si9n/wip/shading
Browse files Browse the repository at this point in the history
Fix shading rules
  • Loading branch information
eed3si9n authored Mar 21, 2021
2 parents 0cbbdfd + b07bd79 commit bb99218
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
uses: coursier/cache-action@v6
- name: Build and test
run: |
sbt -v "mimaReportBinaryIssues; scalafmtCheckAll; packageBin; test;"
sbt -v "mimaReportBinaryIssues; scalafmtCheckAll; shadedPackageBin; test;"
ci-test/test.sh
rm -rf "$HOME/.ivy2/local" || true
find $HOME/Library/Caches/Coursier/v1 -name "ivydata-*.properties" -delete || true
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ lazy val root = (project in file("."))
"publishSigned" ::
state
}
validNamespaces ++= Set("xsbt", "xsbti", "scala", "org.apache.ivy")
validNamespaces ++= Set("xsbt", "xsbti", "scala", "org.apache.ivy", "org.fusesource.jansi")
validEntries ++= Set("LICENSE", "NOTICE", "module.properties")
shadingRules ++= {
Seq(
Expand Down
7 changes: 5 additions & 2 deletions ci-test/test.sh
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
#!/bin/bash -e

LAUNCHER="../../launcher-implementation/target/proguard/launcher-implementation-1.2.0-SNAPSHOT-shading.jar"

pushd ci-test/app0
COURSIER_CACHE=/tmp/cache/ java -jar ../../launcher-implementation/target/proguard/launcher-implementation-1.2.0-SNAPSHOT.jar @sbt.1.3.13.boot.properties exit
COURSIER_CACHE=/tmp/cache/ java -jar $LAUNCHER @sbt.1.3.13.boot.properties exit
popd

#!/bin/bash -e
pushd ci-test/app1
COURSIER_CACHE=/tmp/cache/ java -jar ../../launcher-implementation/target/proguard/launcher-implementation-1.2.0-SNAPSHOT.jar @sbt.0.13.18.boot.properties exit
COURSIER_CACHE=/tmp/cache/ java -jar $LAUNCHER @sbt.0.13.18.boot.properties exit
popd

0 comments on commit bb99218

Please sign in to comment.