From 9815efb47b7571ea29ec14c882880ec28548503c Mon Sep 17 00:00:00 2001 From: Lorenzo Gabriele Date: Tue, 2 Aug 2022 16:24:04 +0200 Subject: [PATCH] Support Scala 3 --- build.sbt | 4 +-- examples/fonts/project/plugins.sbt | 2 +- examples/opengl-cube-3d/project/plugins.sbt | 2 +- examples/opengl-setup/project/plugins.sbt | 2 +- examples/opengl3-setup/project/plugins.sbt | 2 +- examples/red-book/project/plugins.sbt | 2 +- examples/snake/project/plugins.sbt | 2 +- examples/threading/project/plugins.sbt | 2 +- project/build.properties | 2 +- project/plugins.sbt | 2 +- sdl2/src/main/scala/sdl2/Extras.scala | 40 ++++++++++----------- 11 files changed, 31 insertions(+), 31 deletions(-) diff --git a/build.sbt b/build.sbt index 535eb19..0e184ce 100644 --- a/build.sbt +++ b/build.sbt @@ -1,7 +1,7 @@ -val scala213 = "2.13.4" +val scala213 = "2.13.8" ThisBuild / scalaVersion := scala213 -ThisBuild / crossScalaVersions := Seq(scala213, "2.12.13", "2.11.12") +ThisBuild / crossScalaVersions := Seq("3.1.3", scala213, "2.12.16", "2.11.12") ThisBuild / publishTo := Some("releases" at "https://oss.sonatype.org/service/local/staging/deploy/maven2") diff --git a/examples/fonts/project/plugins.sbt b/examples/fonts/project/plugins.sbt index 2f4e38a..6f123b3 100644 --- a/examples/fonts/project/plugins.sbt +++ b/examples/fonts/project/plugins.sbt @@ -1 +1 @@ -addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.0") +addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.5") diff --git a/examples/opengl-cube-3d/project/plugins.sbt b/examples/opengl-cube-3d/project/plugins.sbt index 2f4e38a..6f123b3 100644 --- a/examples/opengl-cube-3d/project/plugins.sbt +++ b/examples/opengl-cube-3d/project/plugins.sbt @@ -1 +1 @@ -addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.0") +addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.5") diff --git a/examples/opengl-setup/project/plugins.sbt b/examples/opengl-setup/project/plugins.sbt index 2f4e38a..6f123b3 100644 --- a/examples/opengl-setup/project/plugins.sbt +++ b/examples/opengl-setup/project/plugins.sbt @@ -1 +1 @@ -addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.0") +addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.5") diff --git a/examples/opengl3-setup/project/plugins.sbt b/examples/opengl3-setup/project/plugins.sbt index 2f4e38a..6f123b3 100644 --- a/examples/opengl3-setup/project/plugins.sbt +++ b/examples/opengl3-setup/project/plugins.sbt @@ -1 +1 @@ -addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.0") +addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.5") diff --git a/examples/red-book/project/plugins.sbt b/examples/red-book/project/plugins.sbt index 2f4e38a..6f123b3 100644 --- a/examples/red-book/project/plugins.sbt +++ b/examples/red-book/project/plugins.sbt @@ -1 +1 @@ -addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.0") +addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.5") diff --git a/examples/snake/project/plugins.sbt b/examples/snake/project/plugins.sbt index 2f4e38a..6f123b3 100644 --- a/examples/snake/project/plugins.sbt +++ b/examples/snake/project/plugins.sbt @@ -1 +1 @@ -addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.0") +addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.5") diff --git a/examples/threading/project/plugins.sbt b/examples/threading/project/plugins.sbt index 2f4e38a..6f123b3 100644 --- a/examples/threading/project/plugins.sbt +++ b/examples/threading/project/plugins.sbt @@ -1 +1 @@ -addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.0") +addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.5") diff --git a/project/build.properties b/project/build.properties index d91c272..5b12c1d 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.4.6 +sbt.version=1.7.0 diff --git a/project/plugins.sbt b/project/plugins.sbt index 2f4e38a..6f123b3 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1 +1 @@ -addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.0") +addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.5") diff --git a/sdl2/src/main/scala/sdl2/Extras.scala b/sdl2/src/main/scala/sdl2/Extras.scala index db5b51c..7193513 100644 --- a/sdl2/src/main/scala/sdl2/Extras.scala +++ b/sdl2/src/main/scala/sdl2/Extras.scala @@ -16,26 +16,26 @@ object Extras { ************ SDL_log.h **************** ***************************************/ - /* Start SDL_LogCategory */ - val SDL_LOG_CATEGORY_APPLICATION = 0 - val SDL_LOG_CATEGORY_ERROR = 1 - val SDL_LOG_CATEGORY_ASSERT = 2 - val SDL_LOG_CATEGORY_SYSTEM = 3 - val SDL_LOG_CATEGORY_AUDIO = 4 - val SDL_LOG_CATEGORY_VIDEO = 5 - val SDL_LOG_CATEGORY_RENDER = 6 - val SDL_LOG_CATEGORY_INPUT = 7 - val SDL_LOG_CATEGORY_TEST = 8 - /* End SDL_LogCategory */ - - /* Start SDL_LogPriority */ - val SDL_LOG_PRIORITY_VERBOSE = 1 - val SDL_LOG_PRIORITY_DEBUG = 2 - val SDL_LOG_PRIORITY_INFO = 3 - val SDL_LOG_PRIORITY_WARN = 4 - val SDL_LOG_PRIORITY_ERROR = 5 - val SDL_LOG_PRIORITY_CRITICAL = 6 - /* End SDL_LogPriority */ + /* Start SDL_LogCategory */ + val SDL_LOG_CATEGORY_APPLICATION = 0 + val SDL_LOG_CATEGORY_ERROR = 1 + val SDL_LOG_CATEGORY_ASSERT = 2 + val SDL_LOG_CATEGORY_SYSTEM = 3 + val SDL_LOG_CATEGORY_AUDIO = 4 + val SDL_LOG_CATEGORY_VIDEO = 5 + val SDL_LOG_CATEGORY_RENDER = 6 + val SDL_LOG_CATEGORY_INPUT = 7 + val SDL_LOG_CATEGORY_TEST = 8 + /* End SDL_LogCategory */ + + /* Start SDL_LogPriority */ + val SDL_LOG_PRIORITY_VERBOSE = 1 + val SDL_LOG_PRIORITY_DEBUG = 2 + val SDL_LOG_PRIORITY_INFO = 3 + val SDL_LOG_PRIORITY_WARN = 4 + val SDL_LOG_PRIORITY_ERROR = 5 + val SDL_LOG_PRIORITY_CRITICAL = 6 + /* End SDL_LogPriority */ /*************************************** ************ SDL_error_c.h *************