Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

deps: update Scala, SBT and dependencies versions #15

Merged
merged 6 commits into from
Apr 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: CI

on:
push:
branches:
- main
pull_request:

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: '21'
cache: 'sbt'

- name: 📦 Run Gitter to apply template
run: sbt g8
24 changes: 0 additions & 24 deletions .travis.yml

This file was deleted.

12 changes: 6 additions & 6 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License
The MIT License

Copyright (c) 2018 CodelyTV staff@codely.tv
Copyright (c) 2024 Codely Enseña y Entretiene SL. https://codely.com

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand All @@ -9,13 +9,13 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
6 changes: 3 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
lazy val root = (project in file("."))
.settings(
scalaVersion := "2.13.7",
scalaVersion := "2.13.13",
organization := "tv.codely",
name := "CodelyTV Scala Bootstrap",
version := "1.2.3",
name := "Codely Scala Bootstrap",
version := "1.3.0",
test in Test := {
val _ = (g8Test in Test).toTask("").value
},
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=0.13.17
sbt.version=1.9.9
2 changes: 1 addition & 1 deletion project/giter8.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
addSbtPlugin("org.foundweekends.giter8" %% "sbt-giter8" % "0.11.0")
addSbtPlugin("org.foundweekends.giter8" %% "sbt-giter8" % "0.16.2")
22 changes: 0 additions & 22 deletions src/main/g8/.travis.yml

This file was deleted.

12 changes: 6 additions & 6 deletions src/main/g8/LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License
The MIT License

Copyright (c) 2018 $organization$ support@$organization$
Copyright (c) 2024 $organization$ https://$organization$

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand All @@ -9,13 +9,13 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
8 changes: 4 additions & 4 deletions src/main/g8/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ Configuration.settings

/** ********* PROD DEPENDENCIES *****************/
libraryDependencies ++= Seq(
"com.github.nscala-time" %% "nscala-time" % "2.22.0",
"com.lihaoyi" %% "pprint" % "0.5.6"
"com.github.nscala-time" %% "nscala-time" % "2.32.0",
"com.lihaoyi" %% "pprint" % "0.9.0"
)

/** ********* TEST DEPENDENCIES *****************/
libraryDependencies ++= Seq(
"org.scalatest" %% "scalatest" % "3.1.1" % Test,
"org.scalamock" %% "scalamock" % "4.4.0" % Test
"org.scalatest" %% "scalatest" % "3.2.18" % Test,
"org.scalamock" %% "scalamock" % "5.1.0" % Test
)

/** ********* COMMANDS ALIASES ******************/
Expand Down
10 changes: 5 additions & 5 deletions src/main/g8/default.properties
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
sbt_version = 1.5.5
scala_version = 2.13.7
name = Scala bootstrap
sbt_version = 1.9.9
scala_version = 2.13.13
name = Scala skeleton
version = 1.0
description = Template following Scala best practices in order to bootstrap your environment and be ready for your next kata or project!
organization = tv.codely
description = Template following Scala best practices to bootstrap your environment and be ready for your next kata or project!
organization = com.codely
package = $organization$.$name;format="lower,snake"$
verbatim = install-hooks.sh pre-push