Fix CI issues

Author: WojciechMazur

.gitignore

@@ -27,3 +27,4 @@ bin/
 
 # vim
 *.swp
+**/*.DS_Store

build.sbt

@@ -1,4 +1,5 @@
-val ScalaNativeVersion = "0.5.9-SNAPSHOT"
+import scala.scalanative.nir.Proxy.nativeBinaryVersion
+
 
 val crossScalaVersions212 = (14 to 20).map("2.12." + _)
 val crossScalaVersions213 = (8 to 16).map("2.13." + _)
@@ -100,9 +101,6 @@ inThisBuild(
           Some("scm:git:[email protected]:scala-native/scala-native-cli.git")
       )
     ),
-    // Used during the releases
-    resolvers += "Sonatype Central Deployments" at "https://central.sonatype.com/api/v1/publisher/deployments/download/",
-    resolvers ++= Resolver.sonatypeOssRepos("snapshots"),
     resolvers += Resolver.sonatypeCentralSnapshots,
     resolvers += Resolver.mavenCentral,
     resolvers += Resolver.defaultLocal
@@ -120,11 +118,10 @@ lazy val cli = project
     crossScalaVersions := publishScalaVersions,
     Compile / run / mainClass :=
       Some("scala.scalanative.cli.ScalaNativeLd"),
-    scalacOptions += "-Ywarn-unused:imports",
-    scalacOptions ++= CrossVersion.partialVersion(scalaVersion.value).collect {
-      case (2, _) => "-target:jvm-1.8"
-      case (3, _) => "-Xtarget:8"
-    },
+    scalacOptions ++= Seq(
+      "-release:8",
+      "-Ywarn-unused:imports"
+    ),
     libraryDependencies ++= Seq(
       "org.scala-native" %% "tools" % scalaNativeVersion.value,
       "com.github.scopt" %% "scopt" % "4.0.1",
@@ -170,13 +167,6 @@ lazy val cliScriptedTests = project
     }
   )
 
-def nativeBinaryVersion(version: String): String = {
-  val VersionPattern = raw"(\d+)\.(\d+)\.(\d+)(\-.*)?".r
-  val VersionPattern(major, minor, patch, milestone) = version
-  if (patch != null && milestone != null) version
-  else s"$major.$minor"
-}
-
 val nativeSourceExtensions = Set(".c", ".cpp", ".cxx", ".h", ".hpp", ".S")
 val DeduplicateOrRename = new sbtassembly.MergeStrategy {
   def name: String = "deduplicate-or-rename"
@@ -230,7 +220,7 @@ lazy val cliPackSettings = Def.settings(
       val lm = {
         import sbt.librarymanagement.ivy._
         val ivyConfig = InlineIvyConfiguration()
-          .withResolvers(resolvers.value.toVector)
+          .withResolvers((ThisBuild / resolvers).value.toVector)
           .withLog(log)
         IvyDependencyResolution(ivyConfig)
       }
@@ -312,9 +302,7 @@ lazy val sonatypePublishSettings = Def.settings(
   publishMavenStyle := true,
   pomIncludeRepository := (_ => false),
   publishTo := {
-    val centralSnapshots =
-      "https://central.sonatype.com/repository/maven-snapshots/"
-    if (isSnapshot.value) Some("central-snapshots" at centralSnapshots)
+    if (isSnapshot.value) Some(Resolver.sonatypeCentralSnapshots)
     else localStaging.value
   },
   credentials ++= {

project/Internals.scala

@@ -0,0 +1,8 @@
+package scala.scalanative
+
+// Proxy to package private methods
+package nir {
+  object Proxy {
+    def nativeBinaryVersion(version: String) = Versions.binaryVersion(version)
+  }
+}

project/plugins.sbt

@@ -1,3 +1,6 @@
 addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "1.0.0")
 addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0")
 addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.0")
+
+// Used only to access cross-version utilities
+addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.8")