Release 0.5.0: Minor updates

This commit is contained in:
Pat Garrity 2025-03-22 11:11:08 -05:00
parent 011ce15ffc
commit f570c91b6b
Signed by: pfm
GPG key ID: 5CA5D21BAB7F3A76
5 changed files with 50 additions and 53 deletions

View file

@ -1,5 +1,5 @@
// See: https://github.com/scalameta/scalafmt/tags for the latest tags.
version = 3.7.17
version = 3.9.4
runner.dialect = scala3
maxColumn = 80

View file

@ -1 +1 @@
sbt.version=1.9.9
sbt.version=1.10.11

View file

@ -3,8 +3,8 @@ package gs;
import sbt._
object Gs {
/**
* Standard compiler options used by GS projects.
/** Standard compiler options used by GS projects.
*/
val CompilerOptions: Seq[String] = Seq(
"-encoding",
@ -24,74 +24,70 @@ object Gs {
"-Wsafe-init" // Enable the safe initialization check.
)
/**
* Host of the GS Git server.
/** Host of the GS Git server.
*/
val GitHost: String = "git.garrity.co"
/**
* Host of the Maven server.
/** Host of the Maven server.
*/
val MavenHost: String = "maven.garrity.co"
/**
* Realm of the Maven server.
/** Realm of the Maven server.
*/
val MavenRealm: String = "Reposilite"
/**
* Organization name used to organize projects in Git.
/** Organization name used to organize projects in Git.
*/
val GitOrganization: String = "garrity-software"
/**
* Human readable organization name.
/** Human readable organization name.
*/
val OrganizationName: String = "Garrity Software"
/**
* Maven Group ID for GS projects.
/** Maven Group ID for GS projects.
*/
val GroupId: String = "gs"
/**
* Calculate the Git repository for a project.
/** Calculate the Git repository for a project.
*
* @param projectName The project name.
* @return The HTTPS Git repository URL.
* @param projectName
* The project name.
* @return
* The HTTPS Git repository URL.
*/
def gitRepo(projectName: String): String =
s"https://$GitHost/$GitOrganization/$projectName"
/**
* Calculate the Git SSH target for a project.
/** Calculate the Git SSH target for a project.
*
* @param projectName The project name.
* @return The SSH target.
* @param projectName
* The project name.
* @return
* The SSH target.
*/
def gitSsh(projectName: String): String =
s"git@$GitHost:$GitOrganization/${projectName}.git"
s"git@$GitHost:$GitOrganization/$projectName.git"
object Environment {
val MavenUser: String = "GS_MAVEN_USER"
val MavenToken: String = "GS_MAVEN_TOKEN"
}
/**
* Prefers to load credentials from file, if a file is available. Otherwise
/** Prefers to load credentials from file, if a file is available. Otherwise
* mandates that the following environment variables exist:
*
* - `GS_MAVEN_USER`
* - `GS_MAVEN_TOKEN`
*
* @return The selected credentials for GS Maven.
* @return
* The selected credentials for GS Maven.
*/
def selectCredentials(): Credentials =
if ((Path.userHome / ".sbt" / ".credentials").exists())
Credentials(Path.userHome / ".sbt" / ".credentials")
else
Credentials.apply(
realm =Gs.MavenRealm,
realm = Gs.MavenRealm,
host = Gs.MavenHost,
userName = sys.env
.get(Gs.Environment.MavenUser)
@ -108,4 +104,5 @@ object Gs {
)
)
)
}

View file

@ -6,12 +6,12 @@ import sbt._
*/
object GsKeys {
/**
* Required setting for projects using the Garrity Software plugin. This
/** Required setting for projects using the Garrity Software plugin. This
* value must match the Git repository name. This value is used to configure
* publishing and generate sub-project names.
*/
lazy val gsProjectName = settingKey[String](
"Name of the project and Git repository."
)
}