-
Notifications
You must be signed in to change notification settings - Fork 7
Bump scala and deps, move to sbt #75
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
Merged
Merged
Changes from 19 commits
Commits
Show all changes
28 commits
Select commit
Hold shift + click to select a range
f24895b
bump mill, scalas and who knows what else
kubukoz 0b2e649
WIP
kubukoz 44d7048
no i give up on this.
kubukoz 2e05892
Migrate to sbt
kubukoz aeda415
hopeful publishing
kubukoz 1970734
Publish attempt 1
kubukoz 740e51a
no conflicts for u
kubukoz 978628c
publish under polyvariant
kubukoz 04f184d
compile before test
kubukoz 7c2b643
restore org
kubukoz beb4240
Revert "restore org"
kubukoz 3a3e2c4
eh
kubukoz f091fad
let's do it twice
kubukoz e1b8dc1
workaround attempt
kubukoz 0b70bde
fix mima
kubukoz 98eff82
Revert "workaround attempt"
kubukoz 81a1942
restore settings
kubukoz c8b2451
simplify build a tiny bit
kubukoz 66e5d5b
looks like we don't need this anymore
kubukoz 76195e3
Revert "restore settings"
kubukoz 5e2ad48
bump jsoniter (not to latest, because Native 0.4)
kubukoz af23299
use absolute file
kubukoz 4b70418
new workaround, who dis
kubukoz 50933b9
include packaging?
kubukoz 6a079ae
restore settings
kubukoz 6bbc3b1
Merge branch 'main' into bump-mill-and-scalas
kubukoz 483f95a
publish for now
kubukoz 38e0864
fix fs2 dep
kubukoz File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
-J-Xmx6g |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,107 @@ | ||
import org.typelevel.sbt.tpolecat.DevMode | ||
import org.typelevel.sbt.tpolecat.OptionsMode | ||
import java.net.URI | ||
|
||
inThisBuild( | ||
List( | ||
organization := "tech.neander", | ||
homepage := Some(url("https://github.com/neandertech/jsonrpclib")), | ||
licenses := List(License.Apache2), | ||
developers := List( | ||
Developer("Baccata", "Olivier Mélois", "baccata64@gmail.com", URI.create("https://github.com/baccata").toURL) | ||
), | ||
sonatypeCredentialHost := "s01.oss.sonatype.org", | ||
sonatypeRepository := "https://s01.oss.sonatype.org/service/local" | ||
) | ||
) | ||
|
||
val scala213 = "2.13.16" | ||
val scala3 = "3.3.5" | ||
val allScalaVersions = List(scala213, scala3) | ||
val jvmScalaVersions = allScalaVersions | ||
val jsScalaVersions = allScalaVersions | ||
val nativeScalaVersions = allScalaVersions | ||
|
||
ThisBuild / tpolecatOptionsMode := DevMode | ||
|
||
val commonSettings = Seq( | ||
libraryDependencies ++= Seq( | ||
"com.disneystreaming" %%% "weaver-cats" % "0.8.4" % Test | ||
), | ||
mimaPreviousArtifacts := Set( | ||
organization.value %%% name.value % "0.0.7" | ||
), | ||
scalacOptions += "-java-output-version:8" | ||
) | ||
|
||
val core = projectMatrix | ||
.in(file("modules") / "core") | ||
.jvmPlatform( | ||
jvmScalaVersions, | ||
Test / unmanagedSourceDirectories ++= Seq(projectMatrixBaseDirectory.value / "src" / "test" / "scalajvm-native") | ||
) | ||
.jsPlatform(jsScalaVersions) | ||
.nativePlatform( | ||
nativeScalaVersions, | ||
Test / unmanagedSourceDirectories ++= Seq(projectMatrixBaseDirectory.value / "src" / "test" / "scalajvm-native") | ||
) | ||
.disablePlugins(AssemblyPlugin) | ||
.settings( | ||
name := "jsonrpclib-core", | ||
commonSettings, | ||
libraryDependencies ++= Seq( | ||
"com.github.plokhotnyuk.jsoniter-scala" %%% "jsoniter-scala-macros" % "2.17.0" | ||
) | ||
) | ||
|
||
val fs2 = projectMatrix | ||
.in(file("modules") / "fs2") | ||
.jvmPlatform(jvmScalaVersions) | ||
.jsPlatform(jsScalaVersions) | ||
.nativePlatform(nativeScalaVersions) | ||
.disablePlugins(AssemblyPlugin) | ||
.dependsOn(core) | ||
.settings( | ||
name := "jsonrpclib-fs2", | ||
commonSettings, | ||
libraryDependencies ++= Seq( | ||
"co.fs2" %%% "fs2-io" % "3.12.0" | ||
) | ||
) | ||
|
||
val exampleServer = projectMatrix | ||
.in(file("modules") / "examples/server") | ||
.jvmPlatform(List(scala213)) | ||
.dependsOn(fs2) | ||
.settings( | ||
commonSettings, | ||
publish / skip := true | ||
) | ||
.disablePlugins(MimaPlugin) | ||
|
||
val exampleClient = projectMatrix | ||
.in(file("modules") / "examples/client") | ||
.jvmPlatform( | ||
List(scala213), | ||
Seq( | ||
fork := true, | ||
envVars += "SERVER_JAR" -> (exampleServer.jvm(scala213) / assembly).value.toString | ||
) | ||
) | ||
.disablePlugins(AssemblyPlugin) | ||
.dependsOn(fs2) | ||
.settings( | ||
commonSettings, | ||
publish / skip := true | ||
) | ||
.disablePlugins(MimaPlugin) | ||
|
||
val root = project | ||
.in(file(".")) | ||
.settings( | ||
publish / skip := true | ||
) | ||
.disablePlugins(MimaPlugin, AssemblyPlugin) | ||
.aggregate(List(core, fs2, exampleServer, exampleClient).flatMap(_.projectRefs): _*) | ||
|
||
addCommandAlias("ci", "test;scalafmtCheckAll;mimaReportBinaryIssues") |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.