From eb1c5461deaccd9fd57a43060daed6751dc8f2fb Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Mon, 19 Apr 2021 10:45:29 -0400 Subject: [PATCH] move to launcher-package/ --- .gitattributes | 1 - .github/ISSUE_TEMPLATE/no-new-issues.md | 9 -- .github/workflows/ci.yml | 81 ------------------ .gitignore | 15 ---- .../Run_integrationTest_test.xml | 12 --- .../CONTRIBUTING.md | 0 LICENSE => launcher-package/LICENSE | 0 NOTICE => launcher-package/NOTICE | 0 README.md => launcher-package/README.md | 0 {bin => launcher-package/bin}/coursier | Bin {bin => launcher-package/bin}/coursier.bat | 0 build.sbt => launcher-package/build.sbt | 0 .../citest}/Hello.scala | 0 {citest => launcher-package/citest}/build.sbt | 0 .../citest}/project/build.properties | 0 .../citest}/src/test/scala/HelloTest.scala | 0 {citest => launcher-package/citest}/test.bat | 0 {citest => launcher-package/citest}/test.sh | 0 .../citest}/test3/.jvmopts | 0 .../citest}/test3/build.sbt | 0 .../citest}/test3/test3.bat | 0 .../integration-test}/bin/java | 0 .../integration-test}/bin/java.cmd | 0 .../src/test/scala/InheritInput.scala | 0 .../src/test/scala/PowerAssertions.scala | 0 .../src/test/scala/Process.scala | 0 .../src/test/scala/ProcessImpl.scala | 0 .../src/test/scala/RunnerTest.scala | 0 .../src/test/scala/ScriptTest.scala | 0 .../src/test/scala/SyncVar.scala | 0 .../project}/PackageSignerPlugin.scala | 0 .../project}/build.properties | 0 .../project}/plugins.sbt | 0 .../src}/debian/changelog | 0 .../src}/debian/usr/share/doc/sbt/copyright | 0 .../src}/linux/usr/share/doc/sbt/copyright | 0 .../src}/linux/usr/share/man/man1/sbt.1 | 0 .../src}/universal/bin/sbt | 0 .../src}/universal/bin/sbt.bat | 0 .../src}/universal/conf/sbtconfig.txt | 0 .../src}/universal/conf/sbtopts | 0 .../src}/windows/License.rtf | Bin {src => launcher-package/src}/windows/sbt | 0 .../upload}/sbt-upload.sh | 0 44 files changed, 118 deletions(-) delete mode 100644 .gitattributes delete mode 100644 .github/ISSUE_TEMPLATE/no-new-issues.md delete mode 100644 .github/workflows/ci.yml delete mode 100644 .gitignore delete mode 100644 .idea/runConfigurations/Run_integrationTest_test.xml rename CONTRIBUTING.md => launcher-package/CONTRIBUTING.md (100%) rename LICENSE => launcher-package/LICENSE (100%) rename NOTICE => launcher-package/NOTICE (100%) rename README.md => launcher-package/README.md (100%) rename {bin => launcher-package/bin}/coursier (100%) rename {bin => launcher-package/bin}/coursier.bat (100%) rename build.sbt => launcher-package/build.sbt (100%) rename {citest => launcher-package/citest}/Hello.scala (100%) rename {citest => launcher-package/citest}/build.sbt (100%) rename {citest => launcher-package/citest}/project/build.properties (100%) rename {citest => launcher-package/citest}/src/test/scala/HelloTest.scala (100%) rename {citest => launcher-package/citest}/test.bat (100%) rename {citest => launcher-package/citest}/test.sh (100%) rename {citest => launcher-package/citest}/test3/.jvmopts (100%) rename {citest => launcher-package/citest}/test3/build.sbt (100%) rename {citest => launcher-package/citest}/test3/test3.bat (100%) rename {integration-test => launcher-package/integration-test}/bin/java (100%) rename {integration-test => launcher-package/integration-test}/bin/java.cmd (100%) rename {integration-test => launcher-package/integration-test}/src/test/scala/InheritInput.scala (100%) rename {integration-test => launcher-package/integration-test}/src/test/scala/PowerAssertions.scala (100%) rename {integration-test => launcher-package/integration-test}/src/test/scala/Process.scala (100%) rename {integration-test => launcher-package/integration-test}/src/test/scala/ProcessImpl.scala (100%) rename {integration-test => launcher-package/integration-test}/src/test/scala/RunnerTest.scala (100%) rename {integration-test => launcher-package/integration-test}/src/test/scala/ScriptTest.scala (100%) rename {integration-test => launcher-package/integration-test}/src/test/scala/SyncVar.scala (100%) rename {project => launcher-package/project}/PackageSignerPlugin.scala (100%) rename {project => launcher-package/project}/build.properties (100%) rename {project => launcher-package/project}/plugins.sbt (100%) rename {src => launcher-package/src}/debian/changelog (100%) rename {src => launcher-package/src}/debian/usr/share/doc/sbt/copyright (100%) rename {src => launcher-package/src}/linux/usr/share/doc/sbt/copyright (100%) rename {src => launcher-package/src}/linux/usr/share/man/man1/sbt.1 (100%) rename {src => launcher-package/src}/universal/bin/sbt (100%) rename {src => launcher-package/src}/universal/bin/sbt.bat (100%) rename {src => launcher-package/src}/universal/conf/sbtconfig.txt (100%) rename {src => launcher-package/src}/universal/conf/sbtopts (100%) rename {src => launcher-package/src}/windows/License.rtf (100%) rename {src => launcher-package/src}/windows/sbt (100%) rename {upload => launcher-package/upload}/sbt-upload.sh (100%) diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index 09be01613..000000000 --- a/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -src/windows/sbtconfig.txt eol=crlf diff --git a/.github/ISSUE_TEMPLATE/no-new-issues.md b/.github/ISSUE_TEMPLATE/no-new-issues.md deleted file mode 100644 index a3fc484f9..000000000 --- a/.github/ISSUE_TEMPLATE/no-new-issues.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -name: No new issues -about: Use https://github.com/sbt/sbt/issues/new/choose instead - ---- - -No new issues should be opened against this repo. - -Please use https://github.com/sbt/sbt/issues/new/choose to file an issue against sbt. diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml deleted file mode 100644 index f00f86426..000000000 --- a/.github/workflows/ci.yml +++ /dev/null @@ -1,81 +0,0 @@ -name: CI -on: - pull_request: - push: - -jobs: - test: - strategy: - fail-fast: false - matrix: - include: - - os: ubuntu-latest - java: 8 - jobtype: 1 - - os: macos-latest - java: 8 - jobtype: 2 - - os: windows-latest - java: 8 - jobtype: 3 - runs-on: ${{ matrix.os }} - env: - JAVA_OPTS: -Xms2048M -Xmx2048M -Xss6M -XX:ReservedCodeCacheSize=256M -Dfile.encoding=UTF-8 - SBT_VER: 1.4.2 - SBT_ETC_FILE: $HOME/etc/sbt/sbtopts - JDK11: adopt@1.11.0-9 - steps: - - name: Checkout - uses: actions/checkout@v1 - - name: Setup - uses: olafurpg/setup-scala@v10 - with: - java-version: "adopt@1.${{ matrix.java }}" - - name: Set up Python 3.7 - uses: actions/setup-python@v2 - with: - python-version: 3.7 - - name: Coursier cache - uses: coursier/cache-action@v5 - - name: Cache sbt - uses: actions/cache@v1 - with: - path: ~/.sbt - key: ${{ runner.os }}-sbt-cache-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} - - name: Build and test - shell: bash - run: | - case ${{ matrix.jobtype }} in - 1) - echo build using JDK 8 test using JDK 8 and JDK 11 - sbt -Dsbt.build.version=$SBT_VER rpm:packageBin debian:packageBin - sbt -Dsbt.build.version=$SBT_VER universal:packageBin universal:stage integrationTest/test - cd citest && ./test.sh - $HOME/bin/jabba install $JDK11 && exec $HOME/bin/jabba which --home $JDK11 - java -Xmx32m -version - ./test.sh - ;; - 2) - echo build using JDK 8, test using JDK 8, on macOS - bin/coursier resolve - sbt -Dsbt.build.version=$SBT_VER universal:packageBin universal:stage integrationTest/test - cd citest && ./test.sh - ;; - 3) - echo build using JDK 8, test using JDK 8, on Windows - bin/coursier.bat resolve - sbt -Dsbt.build.version=$SBT_VER universal:packageBin universal:stage integrationTest/test - cd citest - ./test.bat - test3/test3.bat - ;; - *) - echo unknown jobtype - exit 1 - esac - rm -rf "$HOME/.ivy2/local" || true - rm -r $(find $HOME/.sbt/boot -name "*-SNAPSHOT") || true - find $HOME/Library/Caches/Coursier/v1 -name "ivydata-*.properties" -delete || true - find $HOME/.ivy2/cache -name "ivydata-*.properties" -delete || true - find $HOME/.cache/coursier/v1 -name "ivydata-*.properties" -delete || true - find $HOME/.sbt -name "*.lock" -delete || true diff --git a/.gitignore b/.gitignore deleted file mode 100644 index aa7261561..000000000 --- a/.gitignore +++ /dev/null @@ -1,15 +0,0 @@ -/SbtTemplateProject.scala -target -/project/boot -/project/metals.sbt -/.metals -/project/plugins -lib_managed -src_managed -/ext -.lib -/template-project/project/boot -*~ -/citest/freshly-baked/ -/upload/cookies -.bsp diff --git a/.idea/runConfigurations/Run_integrationTest_test.xml b/.idea/runConfigurations/Run_integrationTest_test.xml deleted file mode 100644 index 3d96baea8..000000000 --- a/.idea/runConfigurations/Run_integrationTest_test.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - \ No newline at end of file diff --git a/CONTRIBUTING.md b/launcher-package/CONTRIBUTING.md similarity index 100% rename from CONTRIBUTING.md rename to launcher-package/CONTRIBUTING.md diff --git a/LICENSE b/launcher-package/LICENSE similarity index 100% rename from LICENSE rename to launcher-package/LICENSE diff --git a/NOTICE b/launcher-package/NOTICE similarity index 100% rename from NOTICE rename to launcher-package/NOTICE diff --git a/README.md b/launcher-package/README.md similarity index 100% rename from README.md rename to launcher-package/README.md diff --git a/bin/coursier b/launcher-package/bin/coursier similarity index 100% rename from bin/coursier rename to launcher-package/bin/coursier diff --git a/bin/coursier.bat b/launcher-package/bin/coursier.bat similarity index 100% rename from bin/coursier.bat rename to launcher-package/bin/coursier.bat diff --git a/build.sbt b/launcher-package/build.sbt similarity index 100% rename from build.sbt rename to launcher-package/build.sbt diff --git a/citest/Hello.scala b/launcher-package/citest/Hello.scala similarity index 100% rename from citest/Hello.scala rename to launcher-package/citest/Hello.scala diff --git a/citest/build.sbt b/launcher-package/citest/build.sbt similarity index 100% rename from citest/build.sbt rename to launcher-package/citest/build.sbt diff --git a/citest/project/build.properties b/launcher-package/citest/project/build.properties similarity index 100% rename from citest/project/build.properties rename to launcher-package/citest/project/build.properties diff --git a/citest/src/test/scala/HelloTest.scala b/launcher-package/citest/src/test/scala/HelloTest.scala similarity index 100% rename from citest/src/test/scala/HelloTest.scala rename to launcher-package/citest/src/test/scala/HelloTest.scala diff --git a/citest/test.bat b/launcher-package/citest/test.bat similarity index 100% rename from citest/test.bat rename to launcher-package/citest/test.bat diff --git a/citest/test.sh b/launcher-package/citest/test.sh similarity index 100% rename from citest/test.sh rename to launcher-package/citest/test.sh diff --git a/citest/test3/.jvmopts b/launcher-package/citest/test3/.jvmopts similarity index 100% rename from citest/test3/.jvmopts rename to launcher-package/citest/test3/.jvmopts diff --git a/citest/test3/build.sbt b/launcher-package/citest/test3/build.sbt similarity index 100% rename from citest/test3/build.sbt rename to launcher-package/citest/test3/build.sbt diff --git a/citest/test3/test3.bat b/launcher-package/citest/test3/test3.bat similarity index 100% rename from citest/test3/test3.bat rename to launcher-package/citest/test3/test3.bat diff --git a/integration-test/bin/java b/launcher-package/integration-test/bin/java similarity index 100% rename from integration-test/bin/java rename to launcher-package/integration-test/bin/java diff --git a/integration-test/bin/java.cmd b/launcher-package/integration-test/bin/java.cmd similarity index 100% rename from integration-test/bin/java.cmd rename to launcher-package/integration-test/bin/java.cmd diff --git a/integration-test/src/test/scala/InheritInput.scala b/launcher-package/integration-test/src/test/scala/InheritInput.scala similarity index 100% rename from integration-test/src/test/scala/InheritInput.scala rename to launcher-package/integration-test/src/test/scala/InheritInput.scala diff --git a/integration-test/src/test/scala/PowerAssertions.scala b/launcher-package/integration-test/src/test/scala/PowerAssertions.scala similarity index 100% rename from integration-test/src/test/scala/PowerAssertions.scala rename to launcher-package/integration-test/src/test/scala/PowerAssertions.scala diff --git a/integration-test/src/test/scala/Process.scala b/launcher-package/integration-test/src/test/scala/Process.scala similarity index 100% rename from integration-test/src/test/scala/Process.scala rename to launcher-package/integration-test/src/test/scala/Process.scala diff --git a/integration-test/src/test/scala/ProcessImpl.scala b/launcher-package/integration-test/src/test/scala/ProcessImpl.scala similarity index 100% rename from integration-test/src/test/scala/ProcessImpl.scala rename to launcher-package/integration-test/src/test/scala/ProcessImpl.scala diff --git a/integration-test/src/test/scala/RunnerTest.scala b/launcher-package/integration-test/src/test/scala/RunnerTest.scala similarity index 100% rename from integration-test/src/test/scala/RunnerTest.scala rename to launcher-package/integration-test/src/test/scala/RunnerTest.scala diff --git a/integration-test/src/test/scala/ScriptTest.scala b/launcher-package/integration-test/src/test/scala/ScriptTest.scala similarity index 100% rename from integration-test/src/test/scala/ScriptTest.scala rename to launcher-package/integration-test/src/test/scala/ScriptTest.scala diff --git a/integration-test/src/test/scala/SyncVar.scala b/launcher-package/integration-test/src/test/scala/SyncVar.scala similarity index 100% rename from integration-test/src/test/scala/SyncVar.scala rename to launcher-package/integration-test/src/test/scala/SyncVar.scala diff --git a/project/PackageSignerPlugin.scala b/launcher-package/project/PackageSignerPlugin.scala similarity index 100% rename from project/PackageSignerPlugin.scala rename to launcher-package/project/PackageSignerPlugin.scala diff --git a/project/build.properties b/launcher-package/project/build.properties similarity index 100% rename from project/build.properties rename to launcher-package/project/build.properties diff --git a/project/plugins.sbt b/launcher-package/project/plugins.sbt similarity index 100% rename from project/plugins.sbt rename to launcher-package/project/plugins.sbt diff --git a/src/debian/changelog b/launcher-package/src/debian/changelog similarity index 100% rename from src/debian/changelog rename to launcher-package/src/debian/changelog diff --git a/src/debian/usr/share/doc/sbt/copyright b/launcher-package/src/debian/usr/share/doc/sbt/copyright similarity index 100% rename from src/debian/usr/share/doc/sbt/copyright rename to launcher-package/src/debian/usr/share/doc/sbt/copyright diff --git a/src/linux/usr/share/doc/sbt/copyright b/launcher-package/src/linux/usr/share/doc/sbt/copyright similarity index 100% rename from src/linux/usr/share/doc/sbt/copyright rename to launcher-package/src/linux/usr/share/doc/sbt/copyright diff --git a/src/linux/usr/share/man/man1/sbt.1 b/launcher-package/src/linux/usr/share/man/man1/sbt.1 similarity index 100% rename from src/linux/usr/share/man/man1/sbt.1 rename to launcher-package/src/linux/usr/share/man/man1/sbt.1 diff --git a/src/universal/bin/sbt b/launcher-package/src/universal/bin/sbt similarity index 100% rename from src/universal/bin/sbt rename to launcher-package/src/universal/bin/sbt diff --git a/src/universal/bin/sbt.bat b/launcher-package/src/universal/bin/sbt.bat similarity index 100% rename from src/universal/bin/sbt.bat rename to launcher-package/src/universal/bin/sbt.bat diff --git a/src/universal/conf/sbtconfig.txt b/launcher-package/src/universal/conf/sbtconfig.txt similarity index 100% rename from src/universal/conf/sbtconfig.txt rename to launcher-package/src/universal/conf/sbtconfig.txt diff --git a/src/universal/conf/sbtopts b/launcher-package/src/universal/conf/sbtopts similarity index 100% rename from src/universal/conf/sbtopts rename to launcher-package/src/universal/conf/sbtopts diff --git a/src/windows/License.rtf b/launcher-package/src/windows/License.rtf similarity index 100% rename from src/windows/License.rtf rename to launcher-package/src/windows/License.rtf diff --git a/src/windows/sbt b/launcher-package/src/windows/sbt similarity index 100% rename from src/windows/sbt rename to launcher-package/src/windows/sbt diff --git a/upload/sbt-upload.sh b/launcher-package/upload/sbt-upload.sh similarity index 100% rename from upload/sbt-upload.sh rename to launcher-package/upload/sbt-upload.sh