Towards 0.4.3 (#13)

* Remove patching mechanism, update build.sbt
* Don't test old versions in the CI

Author: WojciechMazur

.github/workflows/CI.yml

@@ -7,11 +7,7 @@ jobs:
       fail-fast: false
       matrix:
         OS: [ubuntu-18.04, windows-2019]
-        SN: [0.4.0, 0.4.1, 0.4.2]
-        exclude:
-          # does not support windows
-          - OS: windows-2019
-            SN: 0.4.0
+        SN: [0.4.2]
     steps:
       - uses: actions/checkout@v2
       - uses: olafurpg/setup-scala@v13

build.sbt

@@ -20,7 +20,7 @@ val cliAssemblyJarName = settingKey[String]("Name of created assembly jar")
 inThisBuild(
   Def.settings(
     organization := "org.scala-native",
-    scalaNativeVersion := "0.4.2",
+    scalaNativeVersion := "0.4.3-SNAPSHOT",
     version := scalaNativeVersion.value,
     scalaVersion := crossScalaVersions212.last,
     crossScalaVersions := latestsScalaVersions,
@@ -38,7 +38,8 @@ inThisBuild(
         devConnection =
           Some("scm:git:[email protected]:scala-native/scala-native-cli.git")
       )
-    )
+    ),
+    resolvers += Resolver.sonatypeRepo("snapshots")
   )
 )
 val cliPackLibJars =
@@ -50,13 +51,7 @@ lazy val cli = project
   .enablePlugins(BuildInfoPlugin)
   .settings(
     name := "scala-native-cli",
-    crossScalaVersions := {
-      scalaNativeVersion.value match {
-        // No Scala 2.13 artifacts until 0.4.2
-        case "0.4.0" | "0.4.1" => Seq(crossScalaVersions212.last)
-        case _                 => latestsScalaVersions
-      }
-    },
+    crossScalaVersions := latestsScalaVersions,
     Compile / run / mainClass :=
       Some("scala.scalanative.cli.ScalaNativeLd"),
     scalacOptions += "-Ywarn-unused:imports",
@@ -65,7 +60,6 @@ lazy val cli = project
       "com.github.alexarchambault" %% "case-app" % "2.1.0-M10",
       "org.scalatest" %% "scalatest" % "3.1.1" % Test
     ),
-    patchSourcesSettings,
     buildInfoKeys := Seq[BuildInfoKey](
       "nativeVersion" -> scalaNativeVersion.value
     ),
@@ -119,18 +113,15 @@ lazy val cliPackSettings = Def.settings(
     val cliAssemblyJar = assembly.value
 
     // Standard modules needed for linking of Scala Native
-    val optLib = snVer match {
-      case "0.4.0" => Nil
-      case v       => "windowslib" :: Nil
-    }
     val stdLibModuleIDs = Seq(
       "nativelib",
       "clib",
       "posixlib",
+      "windowslib",
       "javalib",
       "auxlib",
       "scalalib"
-    ).++(optLib).map { lib =>
+    ).map { lib =>
       val nativeBinVersion = ScalaNativeCrossVersion.binaryVersion(snVer)
       scalaNativeOrg % s"${lib}_native${nativeBinVersion}_${scalaBinVer}" % snVer
     }
@@ -211,30 +202,6 @@ lazy val cliPackSettings = Def.settings(
   }
 )
 
-// To be removed since 0.4.2
-lazy val patchSourcesSettings = {
-  def patchSources(base: File, version: String, subdir: String) = {
-    val directory = version match {
-      case v @ "0.4.0" => v
-      case _           => "current"
-    }
-    base / "patches" / directory / "src" / subdir / "scala"
-  }
-
-  Def.settings(
-    Compile / unmanagedSourceDirectories += patchSources(
-      sourceDirectory.value,
-      scalaNativeVersion.value,
-      "main"
-    ),
-    Test / unmanagedSourceDirectories += patchSources(
-      sourceDirectory.value,
-      scalaNativeVersion.value,
-      "test"
-    )
-  )
-}
-
 lazy val publishSettings = Def.settings(
   Compile / publishArtifact := true,
   Test / publishArtifact := false,

cli/src/patches/current/src/main/scala/scala/scalanative/cli/options/NativeConfigOptions.scala renamed to cli/src/main/scala/scala/scalanative/cli/options/NativeConfigOptions.scala

@@ -52,24 +52,22 @@ object ConfigConverter {
       clangPP <- toPathOrDiscover(options.nativeConfig.clangPP)(
         Discover.clangpp()
       )
-      maybeNativeConfig <- VersionSpecificOptionsIncluder
-        .withVersionSpecificOptions(
-          options,
-          NativeConfig.empty
-            .withMode(options.nativeConfig.mode)
-            .withLTO(options.nativeConfig.lto)
-            .withGC(options.nativeConfig.gc)
-            .withLinkStubs(options.nativeConfig.linkStubs)
-            .withCheck(options.nativeConfig.check)
-            .withDump(options.nativeConfig.dump)
-            .withOptimize(!options.nativeConfig.noOptimize)
-            .withTargetTriple(options.nativeConfig.targetTriple)
-            .withClang(clang)
-            .withClangPP(clangPP)
-            .withCompileOptions(options.nativeConfig.compileOption)
-            .withLinkingOptions(options.nativeConfig.linkingOption)
-        )
-    } yield maybeNativeConfig
+      ltp <- LinktimePropertyParser.parseAll(options.nativeConfig.ltp)
+    } yield NativeConfig.empty
+      .withMode(options.nativeConfig.mode)
+      .withLTO(options.nativeConfig.lto)
+      .withGC(options.nativeConfig.gc)
+      .withLinkStubs(options.nativeConfig.linkStubs)
+      .withCheck(options.nativeConfig.check)
+      .withCheckFatalWarnings(options.nativeConfig.checkFatalWarnings)
+      .withDump(options.nativeConfig.dump)
+      .withOptimize(!options.nativeConfig.noOptimize)
+      .withTargetTriple(options.nativeConfig.targetTriple)
+      .withClang(clang)
+      .withClangPP(clangPP)
+      .withCompileOptions(options.nativeConfig.compileOption)
+      .withLinkingOptions(options.nativeConfig.linkingOption)
+      .withLinktimeProperties(ltp)
   }
 
   private def generateConfig(