From 7c01636efa7bdfe378f29207f3648b7406e6072b Mon Sep 17 00:00:00 2001 From: Adrien Piquerez Date: Tue, 17 Sep 2024 17:00:04 +0200 Subject: [PATCH] Move sources from sbt-projectmatrix --- .github/decodekey.sh | 4 - .github/workflows/release.txt | 32 --- README.markdown | 199 ------------------ .../src/main/scala/sbt}/ProjectMatrix.scala | 0 .../main/scala/sbt}/ProjectMatrixPlugin.scala | 2 +- .../scala/sbt}/ProjectMatrixReference.scala | 1 - .../src/main/scala/sbt}/ReflectionUtil.scala | 2 +- .../src}/main/scala/sbt/VirtualAxis.scala | 0 .../custom/app/src/main/scala/B.scala | 0 .../sbt-test/project-matrix}/custom/build.sbt | 0 .../custom/core/src/main/scala/A.scala | 0 .../custom/project/ConfigAxis.scala | 0 .../custom/project/plugins.sbt | 0 .../src/sbt-test/project-matrix}/custom/test | 0 .../sbt-test/project-matrix}/finder/build.sbt | 0 .../finder/project/ConfigAxis.scala | 0 .../finder/project/plugins.sbt | 0 .../src/sbt-test/project-matrix}/finder/test | 0 .../com/config/MyClass.java | 0 .../com/config/MyClass.java | 0 .../app/src/main/scala/com/config/Main.scala | 0 .../sbt-test/project-matrix}/java/build.sbt | 0 .../java/project/ConfigAxis.scala | 0 .../project-matrix}/java/project/plugins.sbt | 0 .../src/sbt-test/project-matrix}/java/test | 0 .../src/sbt-test/project-matrix}/js/build.sbt | 0 .../js/core/src/main/scala/Core.scala | 0 .../project-matrix}/js/project/plugins.sbt | 0 .../src/sbt-test/project-matrix}/js/test | 0 .../jvm-sandwich-sbt-1.3/bar-app/D.scala | 0 .../jvm-sandwich-sbt-1.3/bar-core/C.scala | 0 .../jvm-sandwich-sbt-1.3/baz-app/F.scala | 0 .../jvm-sandwich-sbt-1.3/baz-core/E.scala | 0 .../jvm-sandwich-sbt-1.3/build.sbt | 0 .../jvm-sandwich-sbt-1.3/foo-app/B.scala | 0 .../jvm-sandwich-sbt-1.3/foo-core/A.scala | 0 .../project/build.properties | 0 .../jvm-sandwich-sbt-1.3/project/plugins.sbt | 0 .../project-matrix}/jvm-sandwich-sbt-1.3/test | 0 .../jvm-sandwich/bar-app/D.scala | 0 .../jvm-sandwich/bar-core/C.scala | 0 .../jvm-sandwich/baz-app/F.scala | 0 .../jvm-sandwich/baz-core/E.scala | 0 .../project-matrix}/jvm-sandwich/build.sbt | 0 .../jvm-sandwich/foo-app/B.scala | 0 .../jvm-sandwich/foo-core/A.scala | 0 .../jvm-sandwich/project/build.properties | 0 .../jvm-sandwich/project/plugins.sbt | 0 .../project-matrix}/jvm-sandwich/test | 0 .../jvm-with-project-axes/build.sbt | 0 .../domain/src/main/scala/DataType.scala | 0 .../project/ConfigAxis.scala | 0 .../jvm-with-project-axes/project/plugins.sbt | 0 .../jvm-with-project-axes/test | 0 .../app/src/main/scala/Main.scala | 0 .../jvm-with-scoping/build.sbt | 0 .../core/src/main/scala/Core.scala | 0 .../jvm-with-scoping/project/plugins.sbt | 0 .../project-matrix}/jvm-with-scoping/test | 0 .../sbt-test/project-matrix}/jvm/build.sbt | 0 .../jvm/core/src/main/scala/Core.scala | 0 .../project-matrix}/jvm/project/plugins.sbt | 0 .../src/sbt-test/project-matrix}/jvm/test | 0 .../sbt-test/project-matrix}/lib/build.sbt | 0 .../project-matrix}/lib/project/plugins.sbt | 0 .../lib/src/main/scala/Main.scala | 0 .../lib/ss/src/main/scala/Main.scala | 0 .../src/main/java/com/example/Lib.java | 0 .../src/sbt-test/project-matrix}/lib/test | 0 .../native/app/src/main/scala/App.scala | 0 .../sbt-test/project-matrix}/native/build.sbt | 0 .../native/core/src/main/scala/Core.scala | 0 .../native/core/src/main/scala/CoreMain.scala | 0 .../native/project/build.properties | 0 .../native/project/plugins.sbt | 0 .../src/sbt-test/project-matrix}/native/test | 0 .../project-matrix}/projectAxes/build.sbt | 0 .../projectAxes/project/ConfigAxis.scala | 0 .../projectAxes/project/plugins.sbt | 0 .../sbt-test/project-matrix}/projectAxes/test | 0 80 files changed, 2 insertions(+), 238 deletions(-) delete mode 100755 .github/decodekey.sh delete mode 100644 .github/workflows/release.txt delete mode 100644 README.markdown rename {src/main/scala/sbt/internal => main/src/main/scala/sbt}/ProjectMatrix.scala (100%) rename {src/main/scala/sbtprojectmatrix => main/src/main/scala/sbt}/ProjectMatrixPlugin.scala (97%) rename {src/main/scala/sbt/internal => main/src/main/scala/sbt}/ProjectMatrixReference.scala (92%) rename {src/main/scala/sbtprojectmatrix => main/src/main/scala/sbt}/ReflectionUtil.scala (98%) rename {src => main/src}/main/scala/sbt/VirtualAxis.scala (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/custom/app/src/main/scala/B.scala (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/custom/build.sbt (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/custom/core/src/main/scala/A.scala (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/custom/project/ConfigAxis.scala (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/custom/project/plugins.sbt (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/custom/test (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/finder/build.sbt (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/finder/project/ConfigAxis.scala (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/finder/project/plugins.sbt (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/finder/test (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/java/app/src/main/java-config1.2-jvm/com/config/MyClass.java (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/java/app/src/main/java-config1.3-jvm/com/config/MyClass.java (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/java/app/src/main/scala/com/config/Main.scala (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/java/build.sbt (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/java/project/ConfigAxis.scala (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/java/project/plugins.sbt (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/java/test (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/js/build.sbt (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/js/core/src/main/scala/Core.scala (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/js/project/plugins.sbt (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/js/test (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/jvm-sandwich-sbt-1.3/bar-app/D.scala (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/jvm-sandwich-sbt-1.3/bar-core/C.scala (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/jvm-sandwich-sbt-1.3/baz-app/F.scala (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/jvm-sandwich-sbt-1.3/baz-core/E.scala (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/jvm-sandwich-sbt-1.3/build.sbt (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/jvm-sandwich-sbt-1.3/foo-app/B.scala (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/jvm-sandwich-sbt-1.3/foo-core/A.scala (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/jvm-sandwich-sbt-1.3/project/build.properties (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/jvm-sandwich-sbt-1.3/project/plugins.sbt (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/jvm-sandwich-sbt-1.3/test (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/jvm-sandwich/bar-app/D.scala (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/jvm-sandwich/bar-core/C.scala (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/jvm-sandwich/baz-app/F.scala (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/jvm-sandwich/baz-core/E.scala (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/jvm-sandwich/build.sbt (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/jvm-sandwich/foo-app/B.scala (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/jvm-sandwich/foo-core/A.scala (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/jvm-sandwich/project/build.properties (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/jvm-sandwich/project/plugins.sbt (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/jvm-sandwich/test (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/jvm-with-project-axes/build.sbt (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/jvm-with-project-axes/domain/src/main/scala/DataType.scala (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/jvm-with-project-axes/project/ConfigAxis.scala (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/jvm-with-project-axes/project/plugins.sbt (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/jvm-with-project-axes/test (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/jvm-with-scoping/app/src/main/scala/Main.scala (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/jvm-with-scoping/build.sbt (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/jvm-with-scoping/core/src/main/scala/Core.scala (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/jvm-with-scoping/project/plugins.sbt (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/jvm-with-scoping/test (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/jvm/build.sbt (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/jvm/core/src/main/scala/Core.scala (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/jvm/project/plugins.sbt (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/jvm/test (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/lib/build.sbt (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/lib/project/plugins.sbt (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/lib/src/main/scala/Main.scala (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/lib/ss/src/main/scala/Main.scala (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/lib/strayJar/src/main/java/com/example/Lib.java (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/lib/test (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/native/app/src/main/scala/App.scala (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/native/build.sbt (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/native/core/src/main/scala/Core.scala (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/native/core/src/main/scala/CoreMain.scala (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/native/project/build.properties (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/native/project/plugins.sbt (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/native/test (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/projectAxes/build.sbt (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/projectAxes/project/ConfigAxis.scala (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/projectAxes/project/plugins.sbt (100%) rename {src/sbt-test/projectMatrix => sbt-app/src/sbt-test/project-matrix}/projectAxes/test (100%) diff --git a/.github/decodekey.sh b/.github/decodekey.sh deleted file mode 100755 index ac7c2c58f..000000000 --- a/.github/decodekey.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -# echo $PGP_SECRET | base64 --decode | gpg --import --batch --yes --pinentry-mode loopback --passphrase $PGP_PASSPHRASE -echo $PGP_SECRET | base64 --decode | gpg --batch --import diff --git a/.github/workflows/release.txt b/.github/workflows/release.txt deleted file mode 100644 index 30bad8521..000000000 --- a/.github/workflows/release.txt +++ /dev/null @@ -1,32 +0,0 @@ -name: Release -on: - push: - tags: ["*"] - -jobs: - build: - runs-on: ubuntu-latest - env: - # define Java options for both official sbt and sbt-extras - JAVA_OPTS: -Xms2048M -Xmx2048M -Xss6M -XX:ReservedCodeCacheSize=256M -Dfile.encoding=UTF-8 - JVM_OPTS: -Xms2048M -Xmx2048M -Xss6M -XX:ReservedCodeCacheSize=256M -Dfile.encoding=UTF-8 - steps: - - name: Checkout - uses: actions/checkout@v3 - - name: Setup JDK - uses: actions/setup-java@v3 - with: - distribution: "temurin" - java-version: 8 - cache: sbt - - name: Release - env: - SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} - SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} - PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }} - PGP_SECRET: ${{ secrets.PGP_SECRET }} - CI_CLEAN: clean - CI_RELEASE: publishSigned - CI_SONATYPE_RELEASE: version - run: | - sbt ci-release diff --git a/README.markdown b/README.markdown deleted file mode 100644 index 7fefdbc00..000000000 --- a/README.markdown +++ /dev/null @@ -1,199 +0,0 @@ -sbt-projectmatrix -================= - -cross building using subprojects. - -This is an experimental plugin that implements better cross building. - -setup ------ - -**Requirements**: Requires sbt 1.2.0 or above. - -In `project/plugins.sbt`: - -```scala -addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.10.0") - -// add also the following for Scala.js support -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.10.1") -``` - -usage ------ - -### building against multiple Scala versions - -After adding sbt-projectmatrix to your build, here's how you can set up a matrix with two Scala versions. - -```scala -ThisBuild / organization := "com.example" -ThisBuild / scalaVersion := "2.13.3" -ThisBuild / version := "0.1.0-SNAPSHOT" - -lazy val core = (projectMatrix in file("core")) - .settings( - name := "core" - ) - .jvmPlatform(scalaVersions = Seq("2.13.3", "2.12.12")) -``` - -This will create subprojects `core` and `core2_12`. -Unlike `++` style stateful cross building, these will build in parallel. - -### two matrices - -It gets more interesting if you have more than one matrix. - -```scala -ThisBuild / organization := "com.example" -ThisBuild / scalaVersion := "2.13.3" -ThisBuild / version := "0.1.0-SNAPSHOT" - -// uncomment if you want root -// lazy val root = (project in file(".")) -// .aggregate(core.projectRefs ++ app.projectRefs: _*) -// .settings( -// ) - -lazy val core = (projectMatrix in file("core")) - .settings( - name := "core" - ) - .jvmPlatform(scalaVersions = Seq("2.13.3", "2.12.12")) - -lazy val app = (projectMatrix in file("app")) - .dependsOn(core) - .settings( - name := "app" - ) - .jvmPlatform(scalaVersions = Seq("2.13.3")) -``` - -This is an example where `core` builds against Scala 2.12 and 2.13, but app only builds for one of them. - -### Scala.js support - -[Scala.js](http://scala-js.org/) support was added in sbt-projectmatrix 0.2.0. -To use this, you need to setup sbt-scalajs as well: - -```scala -lazy val core = (projectMatrix in file("core")) - .settings( - name := "core" - ) - .jsPlatform(scalaVersions = Seq("2.12.12", "2.11.12")) -``` - -This will create subprojects `coreJS2_11` and `coreJS2_12`. - -### Scala Native support - -[Scala Native](http://scala-native.org) support will be added in upcoming release. -To use this, you need to setup sbt-scala-native` as well: - -```scala -lazy val core = (projectMatrix in file("core")) - .settings( - name := "core" - ) - .nativePlatform(scalaVersions = Seq("2.11.12")) -``` - -This will create subproject `coreNative2_11`. - -### parallel cross-library building - -The rows can also be used for parallel cross-library building. -For example, if you want to build against Config 1.2 and Config 1.3, you can do something like this: - -In `project/ConfigAxis.scala`: - -```scala -import sbt._ - -case class ConfigAxis(idSuffix: String, directorySuffix: String) extends VirtualAxis.WeakAxis { -} -``` - -In `build.sbt`: - -```scala -ThisBuild / organization := "com.example" -ThisBuild / version := "0.1.0-SNAPSHOT" - -lazy val config12 = ConfigAxis("Config1_2", "config1.2") -lazy val config13 = ConfigAxis("Config1_3", "config1.3") - -lazy val scala212 = "2.12.10" -lazy val scala211 = "2.11.12" - -lazy val app = (projectMatrix in file("app")) - .settings( - name := "app" - ) - .customRow( - scalaVersions = Seq(scala212, scala211), - axisValues = Seq(config12, VirtualAxis.jvm), - _.settings( - moduleName := name.value + "_config1.2", - libraryDependencies += "com.typesafe" % "config" % "1.2.1" - ) - ) - .customRow( - scalaVersions = Seq(scala212, scala211), - axisValues = Seq(config13, VirtualAxis.jvm), - _.settings( - moduleName := name.value + "_config1.3", - libraryDependencies += "com.typesafe" % "config" % "1.3.3" - ) - ) -``` - -This will create `appConfig1_22_11`, `appConfig1_22_12`, and `appConfig1_32_12` respectively producing `app_config1.3_2.12`, `app_config1.2_2.11`, and `app_config1.2_2.12` artifacts. - -### referencing the generated subprojects - -You might want to reference to one of the projects within `build.sbt`. - -```scala -lazy val core12 = core.jvm("2.12.8") - -lazy val appConfig12_212 = app.finder(config13, VirtualAxis.jvm)("2.12.8") -``` - -In the above `core12` returns `Project` type. - -### accessing axes from subprojects - -Each generated subproject can access the values for all the axes using `virtualAxes` key: - -```scala -lazy val platformTest = settingKey[String]("") - -lazy val core = (projectMatrix in file("core")) - .settings( - name := "core" - ) - .jsPlatform(scalaVersions = Seq("2.12.12", "2.11.12")) - .jvmPlatform(scalaVersion = Seq("2.12.12", "2.13.3")) - .settings( - platformTest := { - if(virtualAxes.value.contains(VirtualAxis.jvm)) - "JVM project" - else - "JS project" - } - ) -``` - -credits -------- - -- The idea of representing cross build using subproject was pionieered by Tobias Schlatter's work on Scala.js plugin, which was later expanded to [ sbt-crossproject](https://github.com/portable-scala/sbt-crossproject). However, this only addresses the platform (JVM, JS, Native) cross building. -- [sbt-cross](https://github.com/lucidsoftware/sbt-cross) written by Paul Draper in 2015 implements cross building across Scala versions. - -license -------- - -MIT License diff --git a/src/main/scala/sbt/internal/ProjectMatrix.scala b/main/src/main/scala/sbt/ProjectMatrix.scala similarity index 100% rename from src/main/scala/sbt/internal/ProjectMatrix.scala rename to main/src/main/scala/sbt/ProjectMatrix.scala diff --git a/src/main/scala/sbtprojectmatrix/ProjectMatrixPlugin.scala b/main/src/main/scala/sbt/ProjectMatrixPlugin.scala similarity index 97% rename from src/main/scala/sbtprojectmatrix/ProjectMatrixPlugin.scala rename to main/src/main/scala/sbt/ProjectMatrixPlugin.scala index 7ae4ad26f..5fe5d8ac2 100644 --- a/src/main/scala/sbtprojectmatrix/ProjectMatrixPlugin.scala +++ b/main/src/main/scala/sbt/ProjectMatrixPlugin.scala @@ -1,4 +1,4 @@ -package sbtprojectmatrix +package sbt import sbt._ import internal._ diff --git a/src/main/scala/sbt/internal/ProjectMatrixReference.scala b/main/src/main/scala/sbt/ProjectMatrixReference.scala similarity index 92% rename from src/main/scala/sbt/internal/ProjectMatrixReference.scala rename to main/src/main/scala/sbt/ProjectMatrixReference.scala index 5ed710cda..2f7d4b8c2 100644 --- a/src/main/scala/sbt/internal/ProjectMatrixReference.scala +++ b/main/src/main/scala/sbt/ProjectMatrixReference.scala @@ -1,5 +1,4 @@ package sbt -package internal /** Identifies a project matrix. */ sealed trait ProjectMatrixReference diff --git a/src/main/scala/sbtprojectmatrix/ReflectionUtil.scala b/main/src/main/scala/sbt/ReflectionUtil.scala similarity index 98% rename from src/main/scala/sbtprojectmatrix/ReflectionUtil.scala rename to main/src/main/scala/sbt/ReflectionUtil.scala index d7d5736d4..33c56d034 100644 --- a/src/main/scala/sbtprojectmatrix/ReflectionUtil.scala +++ b/main/src/main/scala/sbt/ReflectionUtil.scala @@ -1,4 +1,4 @@ -package sbtprojectmatrix +package sbt import java.lang.reflect.InvocationTargetException import scala.reflect.ClassTag diff --git a/src/main/scala/sbt/VirtualAxis.scala b/main/src/main/scala/sbt/VirtualAxis.scala similarity index 100% rename from src/main/scala/sbt/VirtualAxis.scala rename to main/src/main/scala/sbt/VirtualAxis.scala diff --git a/src/sbt-test/projectMatrix/custom/app/src/main/scala/B.scala b/sbt-app/src/sbt-test/project-matrix/custom/app/src/main/scala/B.scala similarity index 100% rename from src/sbt-test/projectMatrix/custom/app/src/main/scala/B.scala rename to sbt-app/src/sbt-test/project-matrix/custom/app/src/main/scala/B.scala diff --git a/src/sbt-test/projectMatrix/custom/build.sbt b/sbt-app/src/sbt-test/project-matrix/custom/build.sbt similarity index 100% rename from src/sbt-test/projectMatrix/custom/build.sbt rename to sbt-app/src/sbt-test/project-matrix/custom/build.sbt diff --git a/src/sbt-test/projectMatrix/custom/core/src/main/scala/A.scala b/sbt-app/src/sbt-test/project-matrix/custom/core/src/main/scala/A.scala similarity index 100% rename from src/sbt-test/projectMatrix/custom/core/src/main/scala/A.scala rename to sbt-app/src/sbt-test/project-matrix/custom/core/src/main/scala/A.scala diff --git a/src/sbt-test/projectMatrix/custom/project/ConfigAxis.scala b/sbt-app/src/sbt-test/project-matrix/custom/project/ConfigAxis.scala similarity index 100% rename from src/sbt-test/projectMatrix/custom/project/ConfigAxis.scala rename to sbt-app/src/sbt-test/project-matrix/custom/project/ConfigAxis.scala diff --git a/src/sbt-test/projectMatrix/custom/project/plugins.sbt b/sbt-app/src/sbt-test/project-matrix/custom/project/plugins.sbt similarity index 100% rename from src/sbt-test/projectMatrix/custom/project/plugins.sbt rename to sbt-app/src/sbt-test/project-matrix/custom/project/plugins.sbt diff --git a/src/sbt-test/projectMatrix/custom/test b/sbt-app/src/sbt-test/project-matrix/custom/test similarity index 100% rename from src/sbt-test/projectMatrix/custom/test rename to sbt-app/src/sbt-test/project-matrix/custom/test diff --git a/src/sbt-test/projectMatrix/finder/build.sbt b/sbt-app/src/sbt-test/project-matrix/finder/build.sbt similarity index 100% rename from src/sbt-test/projectMatrix/finder/build.sbt rename to sbt-app/src/sbt-test/project-matrix/finder/build.sbt diff --git a/src/sbt-test/projectMatrix/finder/project/ConfigAxis.scala b/sbt-app/src/sbt-test/project-matrix/finder/project/ConfigAxis.scala similarity index 100% rename from src/sbt-test/projectMatrix/finder/project/ConfigAxis.scala rename to sbt-app/src/sbt-test/project-matrix/finder/project/ConfigAxis.scala diff --git a/src/sbt-test/projectMatrix/finder/project/plugins.sbt b/sbt-app/src/sbt-test/project-matrix/finder/project/plugins.sbt similarity index 100% rename from src/sbt-test/projectMatrix/finder/project/plugins.sbt rename to sbt-app/src/sbt-test/project-matrix/finder/project/plugins.sbt diff --git a/src/sbt-test/projectMatrix/finder/test b/sbt-app/src/sbt-test/project-matrix/finder/test similarity index 100% rename from src/sbt-test/projectMatrix/finder/test rename to sbt-app/src/sbt-test/project-matrix/finder/test diff --git a/src/sbt-test/projectMatrix/java/app/src/main/java-config1.2-jvm/com/config/MyClass.java b/sbt-app/src/sbt-test/project-matrix/java/app/src/main/java-config1.2-jvm/com/config/MyClass.java similarity index 100% rename from src/sbt-test/projectMatrix/java/app/src/main/java-config1.2-jvm/com/config/MyClass.java rename to sbt-app/src/sbt-test/project-matrix/java/app/src/main/java-config1.2-jvm/com/config/MyClass.java diff --git a/src/sbt-test/projectMatrix/java/app/src/main/java-config1.3-jvm/com/config/MyClass.java b/sbt-app/src/sbt-test/project-matrix/java/app/src/main/java-config1.3-jvm/com/config/MyClass.java similarity index 100% rename from src/sbt-test/projectMatrix/java/app/src/main/java-config1.3-jvm/com/config/MyClass.java rename to sbt-app/src/sbt-test/project-matrix/java/app/src/main/java-config1.3-jvm/com/config/MyClass.java diff --git a/src/sbt-test/projectMatrix/java/app/src/main/scala/com/config/Main.scala b/sbt-app/src/sbt-test/project-matrix/java/app/src/main/scala/com/config/Main.scala similarity index 100% rename from src/sbt-test/projectMatrix/java/app/src/main/scala/com/config/Main.scala rename to sbt-app/src/sbt-test/project-matrix/java/app/src/main/scala/com/config/Main.scala diff --git a/src/sbt-test/projectMatrix/java/build.sbt b/sbt-app/src/sbt-test/project-matrix/java/build.sbt similarity index 100% rename from src/sbt-test/projectMatrix/java/build.sbt rename to sbt-app/src/sbt-test/project-matrix/java/build.sbt diff --git a/src/sbt-test/projectMatrix/java/project/ConfigAxis.scala b/sbt-app/src/sbt-test/project-matrix/java/project/ConfigAxis.scala similarity index 100% rename from src/sbt-test/projectMatrix/java/project/ConfigAxis.scala rename to sbt-app/src/sbt-test/project-matrix/java/project/ConfigAxis.scala diff --git a/src/sbt-test/projectMatrix/java/project/plugins.sbt b/sbt-app/src/sbt-test/project-matrix/java/project/plugins.sbt similarity index 100% rename from src/sbt-test/projectMatrix/java/project/plugins.sbt rename to sbt-app/src/sbt-test/project-matrix/java/project/plugins.sbt diff --git a/src/sbt-test/projectMatrix/java/test b/sbt-app/src/sbt-test/project-matrix/java/test similarity index 100% rename from src/sbt-test/projectMatrix/java/test rename to sbt-app/src/sbt-test/project-matrix/java/test diff --git a/src/sbt-test/projectMatrix/js/build.sbt b/sbt-app/src/sbt-test/project-matrix/js/build.sbt similarity index 100% rename from src/sbt-test/projectMatrix/js/build.sbt rename to sbt-app/src/sbt-test/project-matrix/js/build.sbt diff --git a/src/sbt-test/projectMatrix/js/core/src/main/scala/Core.scala b/sbt-app/src/sbt-test/project-matrix/js/core/src/main/scala/Core.scala similarity index 100% rename from src/sbt-test/projectMatrix/js/core/src/main/scala/Core.scala rename to sbt-app/src/sbt-test/project-matrix/js/core/src/main/scala/Core.scala diff --git a/src/sbt-test/projectMatrix/js/project/plugins.sbt b/sbt-app/src/sbt-test/project-matrix/js/project/plugins.sbt similarity index 100% rename from src/sbt-test/projectMatrix/js/project/plugins.sbt rename to sbt-app/src/sbt-test/project-matrix/js/project/plugins.sbt diff --git a/src/sbt-test/projectMatrix/js/test b/sbt-app/src/sbt-test/project-matrix/js/test similarity index 100% rename from src/sbt-test/projectMatrix/js/test rename to sbt-app/src/sbt-test/project-matrix/js/test diff --git a/src/sbt-test/projectMatrix/jvm-sandwich-sbt-1.3/bar-app/D.scala b/sbt-app/src/sbt-test/project-matrix/jvm-sandwich-sbt-1.3/bar-app/D.scala similarity index 100% rename from src/sbt-test/projectMatrix/jvm-sandwich-sbt-1.3/bar-app/D.scala rename to sbt-app/src/sbt-test/project-matrix/jvm-sandwich-sbt-1.3/bar-app/D.scala diff --git a/src/sbt-test/projectMatrix/jvm-sandwich-sbt-1.3/bar-core/C.scala b/sbt-app/src/sbt-test/project-matrix/jvm-sandwich-sbt-1.3/bar-core/C.scala similarity index 100% rename from src/sbt-test/projectMatrix/jvm-sandwich-sbt-1.3/bar-core/C.scala rename to sbt-app/src/sbt-test/project-matrix/jvm-sandwich-sbt-1.3/bar-core/C.scala diff --git a/src/sbt-test/projectMatrix/jvm-sandwich-sbt-1.3/baz-app/F.scala b/sbt-app/src/sbt-test/project-matrix/jvm-sandwich-sbt-1.3/baz-app/F.scala similarity index 100% rename from src/sbt-test/projectMatrix/jvm-sandwich-sbt-1.3/baz-app/F.scala rename to sbt-app/src/sbt-test/project-matrix/jvm-sandwich-sbt-1.3/baz-app/F.scala diff --git a/src/sbt-test/projectMatrix/jvm-sandwich-sbt-1.3/baz-core/E.scala b/sbt-app/src/sbt-test/project-matrix/jvm-sandwich-sbt-1.3/baz-core/E.scala similarity index 100% rename from src/sbt-test/projectMatrix/jvm-sandwich-sbt-1.3/baz-core/E.scala rename to sbt-app/src/sbt-test/project-matrix/jvm-sandwich-sbt-1.3/baz-core/E.scala diff --git a/src/sbt-test/projectMatrix/jvm-sandwich-sbt-1.3/build.sbt b/sbt-app/src/sbt-test/project-matrix/jvm-sandwich-sbt-1.3/build.sbt similarity index 100% rename from src/sbt-test/projectMatrix/jvm-sandwich-sbt-1.3/build.sbt rename to sbt-app/src/sbt-test/project-matrix/jvm-sandwich-sbt-1.3/build.sbt diff --git a/src/sbt-test/projectMatrix/jvm-sandwich-sbt-1.3/foo-app/B.scala b/sbt-app/src/sbt-test/project-matrix/jvm-sandwich-sbt-1.3/foo-app/B.scala similarity index 100% rename from src/sbt-test/projectMatrix/jvm-sandwich-sbt-1.3/foo-app/B.scala rename to sbt-app/src/sbt-test/project-matrix/jvm-sandwich-sbt-1.3/foo-app/B.scala diff --git a/src/sbt-test/projectMatrix/jvm-sandwich-sbt-1.3/foo-core/A.scala b/sbt-app/src/sbt-test/project-matrix/jvm-sandwich-sbt-1.3/foo-core/A.scala similarity index 100% rename from src/sbt-test/projectMatrix/jvm-sandwich-sbt-1.3/foo-core/A.scala rename to sbt-app/src/sbt-test/project-matrix/jvm-sandwich-sbt-1.3/foo-core/A.scala diff --git a/src/sbt-test/projectMatrix/jvm-sandwich-sbt-1.3/project/build.properties b/sbt-app/src/sbt-test/project-matrix/jvm-sandwich-sbt-1.3/project/build.properties similarity index 100% rename from src/sbt-test/projectMatrix/jvm-sandwich-sbt-1.3/project/build.properties rename to sbt-app/src/sbt-test/project-matrix/jvm-sandwich-sbt-1.3/project/build.properties diff --git a/src/sbt-test/projectMatrix/jvm-sandwich-sbt-1.3/project/plugins.sbt b/sbt-app/src/sbt-test/project-matrix/jvm-sandwich-sbt-1.3/project/plugins.sbt similarity index 100% rename from src/sbt-test/projectMatrix/jvm-sandwich-sbt-1.3/project/plugins.sbt rename to sbt-app/src/sbt-test/project-matrix/jvm-sandwich-sbt-1.3/project/plugins.sbt diff --git a/src/sbt-test/projectMatrix/jvm-sandwich-sbt-1.3/test b/sbt-app/src/sbt-test/project-matrix/jvm-sandwich-sbt-1.3/test similarity index 100% rename from src/sbt-test/projectMatrix/jvm-sandwich-sbt-1.3/test rename to sbt-app/src/sbt-test/project-matrix/jvm-sandwich-sbt-1.3/test diff --git a/src/sbt-test/projectMatrix/jvm-sandwich/bar-app/D.scala b/sbt-app/src/sbt-test/project-matrix/jvm-sandwich/bar-app/D.scala similarity index 100% rename from src/sbt-test/projectMatrix/jvm-sandwich/bar-app/D.scala rename to sbt-app/src/sbt-test/project-matrix/jvm-sandwich/bar-app/D.scala diff --git a/src/sbt-test/projectMatrix/jvm-sandwich/bar-core/C.scala b/sbt-app/src/sbt-test/project-matrix/jvm-sandwich/bar-core/C.scala similarity index 100% rename from src/sbt-test/projectMatrix/jvm-sandwich/bar-core/C.scala rename to sbt-app/src/sbt-test/project-matrix/jvm-sandwich/bar-core/C.scala diff --git a/src/sbt-test/projectMatrix/jvm-sandwich/baz-app/F.scala b/sbt-app/src/sbt-test/project-matrix/jvm-sandwich/baz-app/F.scala similarity index 100% rename from src/sbt-test/projectMatrix/jvm-sandwich/baz-app/F.scala rename to sbt-app/src/sbt-test/project-matrix/jvm-sandwich/baz-app/F.scala diff --git a/src/sbt-test/projectMatrix/jvm-sandwich/baz-core/E.scala b/sbt-app/src/sbt-test/project-matrix/jvm-sandwich/baz-core/E.scala similarity index 100% rename from src/sbt-test/projectMatrix/jvm-sandwich/baz-core/E.scala rename to sbt-app/src/sbt-test/project-matrix/jvm-sandwich/baz-core/E.scala diff --git a/src/sbt-test/projectMatrix/jvm-sandwich/build.sbt b/sbt-app/src/sbt-test/project-matrix/jvm-sandwich/build.sbt similarity index 100% rename from src/sbt-test/projectMatrix/jvm-sandwich/build.sbt rename to sbt-app/src/sbt-test/project-matrix/jvm-sandwich/build.sbt diff --git a/src/sbt-test/projectMatrix/jvm-sandwich/foo-app/B.scala b/sbt-app/src/sbt-test/project-matrix/jvm-sandwich/foo-app/B.scala similarity index 100% rename from src/sbt-test/projectMatrix/jvm-sandwich/foo-app/B.scala rename to sbt-app/src/sbt-test/project-matrix/jvm-sandwich/foo-app/B.scala diff --git a/src/sbt-test/projectMatrix/jvm-sandwich/foo-core/A.scala b/sbt-app/src/sbt-test/project-matrix/jvm-sandwich/foo-core/A.scala similarity index 100% rename from src/sbt-test/projectMatrix/jvm-sandwich/foo-core/A.scala rename to sbt-app/src/sbt-test/project-matrix/jvm-sandwich/foo-core/A.scala diff --git a/src/sbt-test/projectMatrix/jvm-sandwich/project/build.properties b/sbt-app/src/sbt-test/project-matrix/jvm-sandwich/project/build.properties similarity index 100% rename from src/sbt-test/projectMatrix/jvm-sandwich/project/build.properties rename to sbt-app/src/sbt-test/project-matrix/jvm-sandwich/project/build.properties diff --git a/src/sbt-test/projectMatrix/jvm-sandwich/project/plugins.sbt b/sbt-app/src/sbt-test/project-matrix/jvm-sandwich/project/plugins.sbt similarity index 100% rename from src/sbt-test/projectMatrix/jvm-sandwich/project/plugins.sbt rename to sbt-app/src/sbt-test/project-matrix/jvm-sandwich/project/plugins.sbt diff --git a/src/sbt-test/projectMatrix/jvm-sandwich/test b/sbt-app/src/sbt-test/project-matrix/jvm-sandwich/test similarity index 100% rename from src/sbt-test/projectMatrix/jvm-sandwich/test rename to sbt-app/src/sbt-test/project-matrix/jvm-sandwich/test diff --git a/src/sbt-test/projectMatrix/jvm-with-project-axes/build.sbt b/sbt-app/src/sbt-test/project-matrix/jvm-with-project-axes/build.sbt similarity index 100% rename from src/sbt-test/projectMatrix/jvm-with-project-axes/build.sbt rename to sbt-app/src/sbt-test/project-matrix/jvm-with-project-axes/build.sbt diff --git a/src/sbt-test/projectMatrix/jvm-with-project-axes/domain/src/main/scala/DataType.scala b/sbt-app/src/sbt-test/project-matrix/jvm-with-project-axes/domain/src/main/scala/DataType.scala similarity index 100% rename from src/sbt-test/projectMatrix/jvm-with-project-axes/domain/src/main/scala/DataType.scala rename to sbt-app/src/sbt-test/project-matrix/jvm-with-project-axes/domain/src/main/scala/DataType.scala diff --git a/src/sbt-test/projectMatrix/jvm-with-project-axes/project/ConfigAxis.scala b/sbt-app/src/sbt-test/project-matrix/jvm-with-project-axes/project/ConfigAxis.scala similarity index 100% rename from src/sbt-test/projectMatrix/jvm-with-project-axes/project/ConfigAxis.scala rename to sbt-app/src/sbt-test/project-matrix/jvm-with-project-axes/project/ConfigAxis.scala diff --git a/src/sbt-test/projectMatrix/jvm-with-project-axes/project/plugins.sbt b/sbt-app/src/sbt-test/project-matrix/jvm-with-project-axes/project/plugins.sbt similarity index 100% rename from src/sbt-test/projectMatrix/jvm-with-project-axes/project/plugins.sbt rename to sbt-app/src/sbt-test/project-matrix/jvm-with-project-axes/project/plugins.sbt diff --git a/src/sbt-test/projectMatrix/jvm-with-project-axes/test b/sbt-app/src/sbt-test/project-matrix/jvm-with-project-axes/test similarity index 100% rename from src/sbt-test/projectMatrix/jvm-with-project-axes/test rename to sbt-app/src/sbt-test/project-matrix/jvm-with-project-axes/test diff --git a/src/sbt-test/projectMatrix/jvm-with-scoping/app/src/main/scala/Main.scala b/sbt-app/src/sbt-test/project-matrix/jvm-with-scoping/app/src/main/scala/Main.scala similarity index 100% rename from src/sbt-test/projectMatrix/jvm-with-scoping/app/src/main/scala/Main.scala rename to sbt-app/src/sbt-test/project-matrix/jvm-with-scoping/app/src/main/scala/Main.scala diff --git a/src/sbt-test/projectMatrix/jvm-with-scoping/build.sbt b/sbt-app/src/sbt-test/project-matrix/jvm-with-scoping/build.sbt similarity index 100% rename from src/sbt-test/projectMatrix/jvm-with-scoping/build.sbt rename to sbt-app/src/sbt-test/project-matrix/jvm-with-scoping/build.sbt diff --git a/src/sbt-test/projectMatrix/jvm-with-scoping/core/src/main/scala/Core.scala b/sbt-app/src/sbt-test/project-matrix/jvm-with-scoping/core/src/main/scala/Core.scala similarity index 100% rename from src/sbt-test/projectMatrix/jvm-with-scoping/core/src/main/scala/Core.scala rename to sbt-app/src/sbt-test/project-matrix/jvm-with-scoping/core/src/main/scala/Core.scala diff --git a/src/sbt-test/projectMatrix/jvm-with-scoping/project/plugins.sbt b/sbt-app/src/sbt-test/project-matrix/jvm-with-scoping/project/plugins.sbt similarity index 100% rename from src/sbt-test/projectMatrix/jvm-with-scoping/project/plugins.sbt rename to sbt-app/src/sbt-test/project-matrix/jvm-with-scoping/project/plugins.sbt diff --git a/src/sbt-test/projectMatrix/jvm-with-scoping/test b/sbt-app/src/sbt-test/project-matrix/jvm-with-scoping/test similarity index 100% rename from src/sbt-test/projectMatrix/jvm-with-scoping/test rename to sbt-app/src/sbt-test/project-matrix/jvm-with-scoping/test diff --git a/src/sbt-test/projectMatrix/jvm/build.sbt b/sbt-app/src/sbt-test/project-matrix/jvm/build.sbt similarity index 100% rename from src/sbt-test/projectMatrix/jvm/build.sbt rename to sbt-app/src/sbt-test/project-matrix/jvm/build.sbt diff --git a/src/sbt-test/projectMatrix/jvm/core/src/main/scala/Core.scala b/sbt-app/src/sbt-test/project-matrix/jvm/core/src/main/scala/Core.scala similarity index 100% rename from src/sbt-test/projectMatrix/jvm/core/src/main/scala/Core.scala rename to sbt-app/src/sbt-test/project-matrix/jvm/core/src/main/scala/Core.scala diff --git a/src/sbt-test/projectMatrix/jvm/project/plugins.sbt b/sbt-app/src/sbt-test/project-matrix/jvm/project/plugins.sbt similarity index 100% rename from src/sbt-test/projectMatrix/jvm/project/plugins.sbt rename to sbt-app/src/sbt-test/project-matrix/jvm/project/plugins.sbt diff --git a/src/sbt-test/projectMatrix/jvm/test b/sbt-app/src/sbt-test/project-matrix/jvm/test similarity index 100% rename from src/sbt-test/projectMatrix/jvm/test rename to sbt-app/src/sbt-test/project-matrix/jvm/test diff --git a/src/sbt-test/projectMatrix/lib/build.sbt b/sbt-app/src/sbt-test/project-matrix/lib/build.sbt similarity index 100% rename from src/sbt-test/projectMatrix/lib/build.sbt rename to sbt-app/src/sbt-test/project-matrix/lib/build.sbt diff --git a/src/sbt-test/projectMatrix/lib/project/plugins.sbt b/sbt-app/src/sbt-test/project-matrix/lib/project/plugins.sbt similarity index 100% rename from src/sbt-test/projectMatrix/lib/project/plugins.sbt rename to sbt-app/src/sbt-test/project-matrix/lib/project/plugins.sbt diff --git a/src/sbt-test/projectMatrix/lib/src/main/scala/Main.scala b/sbt-app/src/sbt-test/project-matrix/lib/src/main/scala/Main.scala similarity index 100% rename from src/sbt-test/projectMatrix/lib/src/main/scala/Main.scala rename to sbt-app/src/sbt-test/project-matrix/lib/src/main/scala/Main.scala diff --git a/src/sbt-test/projectMatrix/lib/ss/src/main/scala/Main.scala b/sbt-app/src/sbt-test/project-matrix/lib/ss/src/main/scala/Main.scala similarity index 100% rename from src/sbt-test/projectMatrix/lib/ss/src/main/scala/Main.scala rename to sbt-app/src/sbt-test/project-matrix/lib/ss/src/main/scala/Main.scala diff --git a/src/sbt-test/projectMatrix/lib/strayJar/src/main/java/com/example/Lib.java b/sbt-app/src/sbt-test/project-matrix/lib/strayJar/src/main/java/com/example/Lib.java similarity index 100% rename from src/sbt-test/projectMatrix/lib/strayJar/src/main/java/com/example/Lib.java rename to sbt-app/src/sbt-test/project-matrix/lib/strayJar/src/main/java/com/example/Lib.java diff --git a/src/sbt-test/projectMatrix/lib/test b/sbt-app/src/sbt-test/project-matrix/lib/test similarity index 100% rename from src/sbt-test/projectMatrix/lib/test rename to sbt-app/src/sbt-test/project-matrix/lib/test diff --git a/src/sbt-test/projectMatrix/native/app/src/main/scala/App.scala b/sbt-app/src/sbt-test/project-matrix/native/app/src/main/scala/App.scala similarity index 100% rename from src/sbt-test/projectMatrix/native/app/src/main/scala/App.scala rename to sbt-app/src/sbt-test/project-matrix/native/app/src/main/scala/App.scala diff --git a/src/sbt-test/projectMatrix/native/build.sbt b/sbt-app/src/sbt-test/project-matrix/native/build.sbt similarity index 100% rename from src/sbt-test/projectMatrix/native/build.sbt rename to sbt-app/src/sbt-test/project-matrix/native/build.sbt diff --git a/src/sbt-test/projectMatrix/native/core/src/main/scala/Core.scala b/sbt-app/src/sbt-test/project-matrix/native/core/src/main/scala/Core.scala similarity index 100% rename from src/sbt-test/projectMatrix/native/core/src/main/scala/Core.scala rename to sbt-app/src/sbt-test/project-matrix/native/core/src/main/scala/Core.scala diff --git a/src/sbt-test/projectMatrix/native/core/src/main/scala/CoreMain.scala b/sbt-app/src/sbt-test/project-matrix/native/core/src/main/scala/CoreMain.scala similarity index 100% rename from src/sbt-test/projectMatrix/native/core/src/main/scala/CoreMain.scala rename to sbt-app/src/sbt-test/project-matrix/native/core/src/main/scala/CoreMain.scala diff --git a/src/sbt-test/projectMatrix/native/project/build.properties b/sbt-app/src/sbt-test/project-matrix/native/project/build.properties similarity index 100% rename from src/sbt-test/projectMatrix/native/project/build.properties rename to sbt-app/src/sbt-test/project-matrix/native/project/build.properties diff --git a/src/sbt-test/projectMatrix/native/project/plugins.sbt b/sbt-app/src/sbt-test/project-matrix/native/project/plugins.sbt similarity index 100% rename from src/sbt-test/projectMatrix/native/project/plugins.sbt rename to sbt-app/src/sbt-test/project-matrix/native/project/plugins.sbt diff --git a/src/sbt-test/projectMatrix/native/test b/sbt-app/src/sbt-test/project-matrix/native/test similarity index 100% rename from src/sbt-test/projectMatrix/native/test rename to sbt-app/src/sbt-test/project-matrix/native/test diff --git a/src/sbt-test/projectMatrix/projectAxes/build.sbt b/sbt-app/src/sbt-test/project-matrix/projectAxes/build.sbt similarity index 100% rename from src/sbt-test/projectMatrix/projectAxes/build.sbt rename to sbt-app/src/sbt-test/project-matrix/projectAxes/build.sbt diff --git a/src/sbt-test/projectMatrix/projectAxes/project/ConfigAxis.scala b/sbt-app/src/sbt-test/project-matrix/projectAxes/project/ConfigAxis.scala similarity index 100% rename from src/sbt-test/projectMatrix/projectAxes/project/ConfigAxis.scala rename to sbt-app/src/sbt-test/project-matrix/projectAxes/project/ConfigAxis.scala diff --git a/src/sbt-test/projectMatrix/projectAxes/project/plugins.sbt b/sbt-app/src/sbt-test/project-matrix/projectAxes/project/plugins.sbt similarity index 100% rename from src/sbt-test/projectMatrix/projectAxes/project/plugins.sbt rename to sbt-app/src/sbt-test/project-matrix/projectAxes/project/plugins.sbt diff --git a/src/sbt-test/projectMatrix/projectAxes/test b/sbt-app/src/sbt-test/project-matrix/projectAxes/test similarity index 100% rename from src/sbt-test/projectMatrix/projectAxes/test rename to sbt-app/src/sbt-test/project-matrix/projectAxes/test