Skip to content

Commit

Permalink
Rebase + fixes to make code compile after rebasing
Browse files Browse the repository at this point in the history
  • Loading branch information
rochala committed Sep 14, 2024
1 parent 206f937 commit 2849579
Show file tree
Hide file tree
Showing 10 changed files with 15 additions and 396 deletions.
360 changes: 0 additions & 360 deletions api/src/main/scala/com.olegych.scastie.api/ScalaTarget.scala

This file was deleted.

6 changes: 3 additions & 3 deletions api/src/main/scala/org/scastie/api/ScalaTarget.scala
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ case class Native(scalaVersion: String, scalaNativeVersion: String) extends SbtS
}

object Scala3 {
def default: Scala3 = Scala3(BuildInfo.stable3)
def default: Scala3 = Scala3(BuildInfo.stableNext)

def defaultCode: String =
"""|// You can find more examples here:
Expand All @@ -213,7 +213,7 @@ object Scala3 {

case class Scala3(scalaVersion: String) extends SbtScalaTarget {

val targetType: ScalaTargetType = ScalaTargetType.stableLTS
val targetType: ScalaTargetType = ScalaTargetType.Scala3

def scaladexRequest: Map[String, String] =
Map("target" -> "JVM", "scalaVersion" -> binaryScalaVersion)
Expand Down Expand Up @@ -266,7 +266,7 @@ object ScalaCli {
implicit val scalaCliEncoder: Encoder[ScalaCli] = deriveEncoder[ScalaCli]
implicit val scalaCliDecoder: Decoder[ScalaCli] = deriveDecoder[ScalaCli]

def default: ScalaCli = ScalaCli(BuildInfo.latest3)
def default: ScalaCli = ScalaCli(BuildInfo.stableNext)

def defaultCode: String =
"""|// Hello!
Expand Down
1 change: 0 additions & 1 deletion api/src/main/scala/org/scastie/api/SnippetProgress.scala
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import io.circe.generic.semiauto._
import io.circe._
import io.circe.syntax._
import org.scastie.runtime.api._
import org.scastie.api.Error
import RuntimeCodecs._

object SnippetProgress {
Expand Down
Loading

0 comments on commit 2849579

Please sign in to comment.