-
Notifications
You must be signed in to change notification settings - Fork 12
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Adapt organisation & package name after move to Scala Center (#302)
* Prepare move of repo to the Scala Center
- Loading branch information
Showing
88 changed files
with
416 additions
and
456 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,10 +2,10 @@ import Build.* | |
|
||
inThisBuild( | ||
List( | ||
organization := "com.lunatech", | ||
organizationName := "Lunatech", | ||
organizationHomepage := Some(url("https://lunatech.com")), | ||
homepage := Some(url("https://cmt.lunatech.com")), | ||
organization := "ch.epfl.scala", | ||
organizationName := "Scala Center", | ||
organizationHomepage := Some(url("https://scala.epfl.ch")), | ||
homepage := Some(url("https://scala.epfl.ch")), | ||
developers := List(Developer("eloots", "Eric Loots", "[email protected]", url("https://github.com/eloots"))), | ||
licenses := Seq("Apache-2.0" -> url("http://www.apache.org/license/LICENSE-2.0")))) | ||
|
||
|
@@ -32,7 +32,7 @@ lazy val cmta = project | |
.dependsOn(`cmt-core`, `cmt-core` % "test->test") | ||
.settings(commonSettings: _*) | ||
.settings(nativeImageSettings: _*) | ||
.settings(Compile / mainClass := Some("com.lunatech.cmt.admin.Main")) | ||
.settings(Compile / mainClass := Some("coursemgmt.admin.Main")) | ||
.settings(buildInfoKeys := buildKeysWithName("cmta:Course Management Tools (Admin)")) | ||
|
||
lazy val cmtc = project | ||
|
@@ -43,7 +43,7 @@ lazy val cmtc = project | |
.settings(commonSettings: _*) | ||
.settings(nativeImageSettings: _*) | ||
.settings(libraryDependencies ++= Dependencies.cmtcDependencies) | ||
.settings(Compile / mainClass := Some("com.lunatech.cmt.client.Main")) | ||
.settings(Compile / mainClass := Some("coursemgmt.client.Main")) | ||
.settings(buildInfoKeys := buildKeysWithName("Course Management Tools (Client)")) | ||
|
||
lazy val `functional-tests` = project | ||
|
7 changes: 0 additions & 7 deletions
7
cmt-core/src/main/scala/com/lunatech/cmt/client/command/Executable.scala
This file was deleted.
Oops, something went wrong.
2 changes: 1 addition & 1 deletion
2
...n/scala/com/lunatech/cmt/CMTaConfig.scala → ...rc/main/scala/coursemgmt/CMTaConfig.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
package com.lunatech.cmt | ||
package coursemgmt | ||
|
||
/** Copyright 2022 - Eric Loots - [email protected] / Trevor Burton-McCreadie - [email protected] | ||
* | ||
|
2 changes: 1 addition & 1 deletion
2
...n/scala/com/lunatech/cmt/CMTcConfig.scala → ...rc/main/scala/coursemgmt/CMTcConfig.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
package com.lunatech.cmt | ||
package coursemgmt | ||
|
||
/** Copyright 2022 - Eric Loots - [email protected] / Trevor Burton-McCreadie - [email protected] | ||
* | ||
|
2 changes: 1 addition & 1 deletion
2
...a/com/lunatech/cmt/ConsoleFunctions.scala → ...n/scala/coursemgmt/ConsoleFunctions.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
package com.lunatech.cmt | ||
package coursemgmt | ||
|
||
/** Copyright 2022 - Eric Loots - [email protected] / Trevor Burton-McCreadie - [email protected] | ||
* | ||
|
2 changes: 1 addition & 1 deletion
2
.../main/scala/com/lunatech/cmt/Domain.scala → ...re/src/main/scala/coursemgmt/Domain.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
package com.lunatech.cmt | ||
package coursemgmt | ||
|
||
import sbt.io.syntax.{File, file} | ||
|
||
|
2 changes: 1 addition & 1 deletion
2
...c/main/scala/com/lunatech/cmt/Error.scala → ...ore/src/main/scala/coursemgmt/Error.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
package com.lunatech.cmt | ||
package coursemgmt | ||
|
||
sealed trait CmtError { | ||
def prettyPrint: String | ||
|
2 changes: 1 addition & 1 deletion
2
...a/com/lunatech/cmt/ExerciseMetadata.scala → ...n/scala/coursemgmt/ExerciseMetadata.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
package com.lunatech.cmt | ||
package coursemgmt | ||
|
||
import java.util.Map.Entry | ||
import scala.jdk.CollectionConverters.* | ||
|
2 changes: 1 addition & 1 deletion
2
...main/scala/com/lunatech/cmt/Filters.scala → ...e/src/main/scala/coursemgmt/Filters.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
package com.lunatech.cmt | ||
package coursemgmt | ||
|
||
/** Copyright 2022 - Eric Loots - [email protected] / Trevor Burton-McCreadie - [email protected] | ||
* | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
package com.lunatech.cmt | ||
package coursemgmt | ||
|
||
/** Copyright 2022 - Eric Loots - [email protected] / Trevor Burton-McCreadie - [email protected] | ||
* | ||
|
@@ -13,9 +13,9 @@ package com.lunatech.cmt | |
* See the License for the specific language governing permissions and limitations under the License. | ||
*/ | ||
|
||
import com.lunatech.cmt.ProcessDSL.ProcessCmd | ||
import com.lunatech.cmt.core.GeneratorInfo | ||
import com.lunatech.cmt.core.command.Package.* | ||
import coursemgmt.ProcessDSL.ProcessCmd | ||
import coursemgmt.core.GeneratorInfo | ||
import coursemgmt.core.command.Package.* | ||
import com.typesafe.config.{ConfigFactory, ConfigRenderOptions} | ||
import sbt.io.IO as sbtio | ||
import sbt.io.syntax.* | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
package com.lunatech.cmt | ||
package coursemgmt | ||
|
||
/** Copyright 2022 - Eric Loots - [email protected] / Trevor Burton-McCreadie - [email protected] | ||
* | ||
|
@@ -13,9 +13,9 @@ package com.lunatech.cmt | |
* See the License for the specific language governing permissions and limitations under the License. | ||
*/ | ||
|
||
import com.lunatech.cmt.toExecuteCommandErrorMessage | ||
import coursemgmt.toExecuteCommandErrorMessage | ||
import sbt.io.syntax.* | ||
import com.lunatech.cmt.Helpers.ignoreProcessStdOutStdErr | ||
import coursemgmt.Helpers.ignoreProcessStdOutStdErr | ||
|
||
import scala.sys.process.Process | ||
import scala.util.{Failure, Success, Try} | ||
|
2 changes: 1 addition & 1 deletion
2
.../scala/com/lunatech/cmt/Releasables.scala → ...c/main/scala/coursemgmt/Releasables.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
package com.lunatech.cmt | ||
package coursemgmt | ||
|
||
import sbt.io.IO as sbtio | ||
import sbt.io.syntax.* | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
package com.lunatech.cmt | ||
package coursemgmt | ||
|
||
/** Copyright 2022 - Eric Loots - [email protected] / Trevor Burton-McCreadie - [email protected] | ||
* | ||
|
@@ -13,7 +13,6 @@ package com.lunatech.cmt | |
* See the License for the specific language governing permissions and limitations under the License. | ||
*/ | ||
|
||
//import com.lunatech.cmt.{FileValidations, IntValidations, StringValidations} | ||
import sbt.io.syntax.File | ||
|
||
object ValidationExtensions: | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 4 additions & 4 deletions
8
...lunatech/cmt/client/cli/CmtcCommand.scala → ...a/coursemgmt/client/cli/CmtcCommand.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 7 additions & 0 deletions
7
cmt-core/src/main/scala/coursemgmt/client/command/Executable.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
package coursemgmt.client.command | ||
|
||
import coursemgmt.CmtError | ||
import coursemgmt.client.Configuration | ||
|
||
trait Executable[T]: | ||
extension (t: T) def execute(configuration: Configuration): Either[CmtError, String] |
2 changes: 1 addition & 1 deletion
2
...com/lunatech/cmt/core/GeneratorInfo.scala → ...scala/coursemgmt/core/GeneratorInfo.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
package com.lunatech.cmt.core | ||
package coursemgmt.core | ||
|
||
final case class GeneratorInfo(generatorName: String, generatorVersion: String) |
8 changes: 4 additions & 4 deletions
8
...om/lunatech/cmt/core/cli/ArgParsers.scala → ...cala/coursemgmt/core/cli/ArgParsers.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
...om/lunatech/cmt/core/cli/CmtCommand.scala → ...cala/coursemgmt/core/cli/CmtCommand.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...m/lunatech/cmt/core/command/Package.scala → ...ala/coursemgmt/core/command/Package.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
package com.lunatech.cmt.core.execution | ||
package coursemgmt.core.execution | ||
|
||
/** Copyright 2022 - Eric Loots - [email protected] / Trevor Burton-McCreadie - [email protected] | ||
* | ||
|
@@ -13,7 +13,7 @@ package com.lunatech.cmt.core.execution | |
* See the License for the specific language governing permissions and limitations under the License. | ||
*/ | ||
|
||
import com.lunatech.cmt.CmtError | ||
import coursemgmt.CmtError | ||
|
||
trait Executable[T]: | ||
extension (t: T) def execute(): Either[CmtError, String] |
4 changes: 2 additions & 2 deletions
4
...cmt/core/validation/FileValidations.scala → ...gmt/core/validation/FileValidations.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
...ech/cmt/core/validation/Validatable.scala → ...rsemgmt/core/validation/Validatable.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
package com.lunatech.cmt.core.validation | ||
package coursemgmt.core.validation | ||
|
||
import com.lunatech.cmt.CmtError | ||
import coursemgmt.CmtError | ||
|
||
trait Validatable[T]: | ||
extension (t: T) def validated(): Either[CmtError, T] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...tech/cmt/client/command/InstallSpec.scala → ...ursemgmt/client/command/InstallSpec.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...unatech/cmt/core/cli/CmtCommandSpec.scala → .../coursemgmt/core/cli/CmtCommandSpec.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
package com.lunatech.cmt.support | ||
package coursemgmt.support | ||
|
||
/** Copyright 2022 - Eric Loots - [email protected] / Trevor Burton-McCreadie - [email protected] | ||
* | ||
|
@@ -24,7 +24,7 @@ import org.scalatest.wordspec.AnyWordSpecLike | |
import org.scalatestplus.scalacheck.ScalaCheckPropertyChecks | ||
import sbt.io.IO | ||
import sbt.io.syntax.* | ||
import com.lunatech.cmt.{CmtError, toCmtError} | ||
import coursemgmt.{CmtError, toCmtError} | ||
|
||
import scala.language.postfixOps | ||
|
||
|
2 changes: 1 addition & 1 deletion
2
.../lunatech/cmt/support/EitherSupport.scala → ...la/coursemgmt/support/EitherSupport.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
package com.lunatech.cmt.support | ||
package coursemgmt.support | ||
|
||
/** Copyright 2022 - Eric Loots - [email protected] / Trevor Burton-McCreadie - [email protected] | ||
* | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
package com.lunatech.cmt.support | ||
package coursemgmt.support | ||
|
||
/** Copyright 2022 - Eric Loots - [email protected] / Trevor Burton-McCreadie - [email protected] | ||
* | ||
|
@@ -13,9 +13,9 @@ package com.lunatech.cmt.support | |
* See the License for the specific language governing permissions and limitations under the License. | ||
*/ | ||
|
||
import com.lunatech.cmt.Helpers | ||
import coursemgmt.Helpers | ||
import sbt.io.syntax.{File, file} | ||
import com.lunatech.cmt.Helpers.adaptToOSSeparatorChar | ||
import coursemgmt.Helpers.adaptToOSSeparatorChar | ||
|
||
trait TestDirectories { | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
package com.lunatech.cmt.admin | ||
package coursemgmt.admin | ||
|
||
/** Copyright 2022 - Eric Loots - [email protected] / Trevor Burton-McCreadie - [email protected] | ||
* | ||
|
@@ -13,12 +13,12 @@ package com.lunatech.cmt.admin | |
* See the License for the specific language governing permissions and limitations under the License. | ||
*/ | ||
|
||
import com.lunatech.cmt.CmtError | ||
import coursemgmt.CmtError | ||
import sbt.io.syntax.File | ||
import com.lunatech.cmt.* | ||
import coursemgmt.* | ||
import cats.syntax.either.* | ||
|
||
import com.lunatech.cmt.Domain.InstallationSource | ||
import coursemgmt.Domain.InstallationSource | ||
|
||
object Domain: | ||
|
||
|
Oops, something went wrong.