From d9d1257dc8ad231eeec54c1ef821acdfed996169 Mon Sep 17 00:00:00 2001 From: Eric Loots Date: Tue, 25 Jul 2023 13:44:46 +0200 Subject: [PATCH 1/2] Fix publish info - Settings should apply to all sbt projects --- build.sbt | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/build.sbt b/build.sbt index f8ba42f6..774fa072 100644 --- a/build.sbt +++ b/build.sbt @@ -1,6 +1,11 @@ import Build.* -import scala.collection.Seq +inThisBuild( + List( + organization := "com.lunatech", + homepage := Some(url("https://cmt.lunatech.com/")), + developers := List(Developer("eloots", "Eric Loots", "eric.loots@lunatech.com", url("https://github.com/eloots"))), + licenses := Seq("Apache-2.0" -> url("http://www.apache.org/license/LICENSE-2.0")))) ThisBuild / dynverVTagPrefix := false ThisBuild / sonatypeCredentialHost := "s01.oss.sonatype.org" @@ -11,12 +16,6 @@ lazy val `course-management-tools` = .aggregate(cmta, cmtc, core, `functional-tests`, docs) .settings(commonSettings: _*) .settings(publish / skip := true) - .settings(List( - organization := "com.lunatech", - homepage := Some(url("https://cmt.lunatech.com/")), - developers := List( - Developer("eloots", "Eric Loots", "eric.loots@lunatech.com", url("https://github.com/eloots"))), - licenses := Seq("Apache-2.0" -> url("http://www.apache.org/license/LICENSE-2.0")))) lazy val core = project.in(file("core")).settings(commonSettings: _*).settings(libraryDependencies ++= Dependencies.coreDependencies) From a2f6a33af728d18629ebcd7ddb69cf23ac7c56bb Mon Sep 17 00:00:00 2001 From: Eric Loots Date: Tue, 25 Jul 2023 14:00:22 +0200 Subject: [PATCH 2/2] Remove duplicate setting --- project/Build.scala | 1 - 1 file changed, 1 deletion(-) diff --git a/project/Build.scala b/project/Build.scala index b2dc2759..43fdb308 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -20,7 +20,6 @@ object Build { } lazy val commonSettings = Seq( - organization := "com.github.lunatech-labs", scalaVersion := Version.scalaVersion, scalacOptions ++= CompileOptions.compileOptions, buildInfoPackage := "com.lunatech.cmt.version",