From eb7d90097187377210ddf2c03a76926e46d93be9 Mon Sep 17 00:00:00 2001
From: xuwei-k <6b656e6a69@gmail.com>
Date: Fri, 4 Oct 2024 07:08:42 +0900
Subject: [PATCH 1/2] add -Xsource:3

---
 build.sbt | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/build.sbt b/build.sbt
index d42729b..5f3d03f 100644
--- a/build.sbt
+++ b/build.sbt
@@ -17,6 +17,16 @@ ThisBuild / developers := List(
 ThisBuild / description := "Contraband is a description language for your datatypes and APIs, currently targeting Java and Scala."
 Global / semanticdbEnabled := true
 Global / semanticdbVersion := "4.10.1"
+ThisBuild / scalacOptions ++= {
+  scalaBinaryVersion.value match {
+    case "2.12" =>
+      Seq("-Xsource:3")
+    case "2.13" =>
+      Seq("-Xsource:3-cross")
+    case _ =>
+      Nil
+  }
+}
 
 lazy val root = (project in file("."))
   .enablePlugins(TravisSitePlugin)

From 9d0bad5025d1c54da1943ba99388fa7139d92284 Mon Sep 17 00:00:00 2001
From: xuwei-k <6b656e6a69@gmail.com>
Date: Fri, 4 Oct 2024 07:13:48 +0900
Subject: [PATCH 2/2] avoid deprecated `with`

```
Welcome to Scala 3.5.1 (1.8.0_422, Java OpenJDK 64-Bit Server VM).
Type in expressions for evaluation. Or try :help.

scala> trait A; trait B; trait C { self : A with B => }
1 warning found
-- [E003] Syntax Warning: ------------------------------------------------------
1 |trait A; trait B; trait C { self : A with B => }
  |                                     ^^^^
  |                with as a type operator has been deprecated; use & instead
  |
  | longer explanation available when compiling with `-explain`
// defined trait A
// defined trait B
// defined trait C

scala> trait A; trait B; trait C { self : A & B => }
// defined trait A
// defined trait B
// defined trait C
```
---
 .../sbt/contraband/parser/SchemaParser.scala  | 21 +++++++------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/library/src/main/scala/sbt/contraband/parser/SchemaParser.scala b/library/src/main/scala/sbt/contraband/parser/SchemaParser.scala
index 1ac0b23..cb2b646 100644
--- a/library/src/main/scala/sbt/contraband/parser/SchemaParser.scala
+++ b/library/src/main/scala/sbt/contraband/parser/SchemaParser.scala
@@ -5,7 +5,7 @@ import org.parboiled2._
 import CharPredicate.{ HexDigit, Digit19, AlphaNum }
 import scala.util.{ Failure, Success, Try }
 
-trait Tokens extends StringBuilding with PositionTracking { this: Parser with Ignored =>
+trait Tokens extends StringBuilding with PositionTracking { this: Parser & Ignored =>
 
   def Token = rule { Punctuator | Name | NumberValue | StringValue }
 
@@ -153,14 +153,7 @@ trait Ignored extends PositionTracking { this: Parser =>
 }
 
 trait Document {
-  this: Parser
-    with Values
-    with Operations
-    with Types
-    with Tokens /* with Operations*/
-    with Ignored /*with Fragments with Operations with Values*/
-    with Directives
-    with TypeSystemDefinitions =>
+  this: Parser & Values & Operations & Types & Tokens & Ignored & Directives & TypeSystemDefinitions =>
 
   def `package` = rule { Keyword("package") }
 
@@ -183,7 +176,7 @@ trait Document {
 }
 
 trait TypeSystemDefinitions {
-  this: Parser with Tokens with Ignored with Directives with Types with Operations with Values /*with Fragments*/ =>
+  this: Parser & Tokens & Ignored & Directives & Types & Operations & Values =>
 
   def scalar = rule { Keyword("scalar") }
   def `type` = rule { Keyword("type") }
@@ -304,7 +297,7 @@ trait TypeSystemDefinitions {
 }
 
 trait Operations extends PositionTracking {
-  this: Parser with Tokens with Ignored /*with Fragments*/ with Values with Types with Directives =>
+  this: Parser & Tokens & Ignored & Values & Types & Directives =>
 
   // def OperationDefinition = rule {
   //   Comments ~ trackPos ~ SelectionSet ~> ((comment, pos, s) => ast.OperationDefinition(selections = s._1, comments = comment, trailingComments = s._2, position = Some(pos))) |
@@ -360,7 +353,7 @@ trait Operations extends PositionTracking {
   }
 }
 
-trait Values { this: Parser with Tokens with Ignored with Operations with Types with Directives =>
+trait Values { this: Parser & Tokens & Ignored & Operations & Types & Directives =>
 
   def ValueConst: Rule1[ast.Value] = rule {
     NumberValue | RawValue | StringValue | BooleanValue | NullValue | EnumValue | ListValueConst | ObjectValueConst
@@ -439,7 +432,7 @@ trait Values { this: Parser with Tokens with Ignored with Operations with Types
 }
 
 trait Directives {
-  this: Parser with Tokens with Operations with Ignored with Values with Operations with Types =>
+  this: Parser & Tokens & Operations & Ignored & Values & Operations & Types =>
 
   def Directives = rule { Directive.+ ~> (_.toList) }
 
@@ -450,7 +443,7 @@ trait Directives {
 
 }
 
-trait Types { this: Parser with Tokens with Ignored =>
+trait Types { this: Parser & Tokens & Ignored =>
   def `lazy` = rule { Keyword("lazy") }
 
   def Type: Rule1[ast.Type] = rule { LazyType | NonNullType | ListType | NamedType }