Merge branch '12.x' into update/12.x/scala-project-template

Author: Atry

.git-blame-ignore-revs

@@ -1,2 +1,8 @@
 # Scala Steward: Reformat with scalafmt 3.1.2
 fb6cfb8aea15a1b339e3ed69e1e96acd7df4cae6
+
+# Scala Steward: Reformat with scalafmt 3.7.0
+9348974a79cbfbc260d1840a589b7c842dd56a7b
+
+# Scala Steward: Reformat with scalafmt 3.7.3
+9949b27715a382afd78b992ced481ace61cc69b7

.github/workflows/scala-steward.yml

@@ -1,9 +1,4 @@
 on:
-  push:
-    branches-ignore:
-      - "update/**"
-  schedule:
-    - cron: "0 0 * * 0"
   workflow_dispatch:
 
 name: Launch Scala Steward

.github/workflows/scala.yml

@@ -15,8 +15,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        scala:
-          - 2.12.20
+        include:
+          - scala: 3.3.0
+            sbt-args: -J-XX:MaxRAMPercentage=90.0
+          - scala: 2.13.11
+            sbt-args: -J-XX:MaxRAMPercentage=90.0
+          - scala: 2.13.4
+            sbt-args: -J-XX:MaxRAMPercentage=90.0 --addPluginSbtFile=project/plugins.sbt.scala-js.0.6
 
     steps:
       - uses: actions/checkout@v3

.gitignore

@@ -1,4 +1,33 @@
+*.class
+*.log
+*.sjsir
+
+# sbt specific
+.cache
+.history
+.lib/
+dist/*
 target/
+lib_managed/
+src_managed/
+project/boot/
+project/plugins/project/
+
+# Scala-IDE specific
+.scala_dependencies
+.worksheet
+.cache-*
+
+# IntelliJ specific
+.idea/
+.classpath
+.project
+.settings/
+
+# jenv
+.java-version
+
+# Files created for deployment
 local.sbt
 secret/
 .metals/

.sbtopts

@@ -0,0 +1,2 @@
+-J-Xss5m
+-J-XX:MaxMetaspaceSize=9999g

.scalafmt.conf

@@ -1,3 +1,3 @@
-runner.dialect = scala212source3
-version = "3.8.3"
+runner.dialect = scala3
+version = "3.7.5"
 maxColumn = 80

Binding/js/build.sbt

@@ -0,0 +1 @@
+../shared/build.sbt

Binding/js/src/main/scala/com/thoughtworks/binding/BindingJvmOrJs.scala

@@ -0,0 +1,104 @@
+package com.thoughtworks.binding
+
+private[binding] object BindingJvmOrJs {
+
+  type ConstantsData[+A] = scalajs.js.Array[_ <: A]
+
+  @inline
+  def toConstantsData[A](seq: IterableOnce[A]) = {
+    import scalajs.js.JSConverters._
+    seq.toJSArray
+  }
+
+  @inline
+  def toCacheData[A](seq: collection.Iterable[A]) = {
+    import scalajs.js.JSConverters._
+    seq.toJSArray
+  }
+
+  @inline
+  def emptyCacheData[A]: HasCache[A]#Cache = scalajs.js.Array()
+
+  trait HasCache[A] {
+
+    private[binding] type Cache = scalajs.js.Array[A]
+
+    private[binding] def cacheData: Cache
+
+    @inline
+    private[binding] final def getCache(n: Int): A = cacheData(n)
+
+    @inline
+    private[binding] final def updateCache(n: Int, newelem: A): Unit = {
+      cacheData(n) = newelem
+    }
+
+    @inline
+    private[binding] final def cacheLength: Int = cacheData.length
+
+    @inline
+    private[binding] final def clearCache(): Unit = {
+      cacheData.length = 0
+    }
+
+    @inline
+    private[binding] final def removeCache(n: Int): A = {
+      cacheData.remove(n)
+    }
+
+    private[binding] final def removeCache(idx: Int, count: Int): Unit = {
+      cacheData.remove(idx, count)
+    }
+
+    @inline
+    private[binding] final def appendCache(elements: IterableOnce[A]): Seq[A] = {
+      val seq = Seq.from(elements)
+      cacheData ++= seq
+      seq
+    }
+
+    @inline
+    private[binding] final def appendCache(elem: A): Unit = {
+      cacheData += elem
+    }
+
+    @inline
+    private[binding] final def prependCache(elem: A): Unit = {
+      cacheData.unshift(elem)
+    }
+
+    @inline
+    private[binding] final def insertOneCache(n: Int, elem: A): Seq[A] = {
+      cacheData.insert(n, elem)
+      Seq(elem)
+    }
+
+    @inline
+    private[binding] final def insertCache(n: Int, elems: IterableOnce[A]): Seq[A] = {
+      val seq = Seq.from(elems)
+      cacheData.insertAll(n, elems)
+      seq
+    }
+
+    @inline
+    private[binding] final def cacheIterator: Iterator[A] = {
+      cacheData.iterator
+    }
+
+    @inline
+    private[binding] final def spliceCache(from: Int, mappedNewChildren: Cache, replaced: Int) = {
+      cacheData.splice(from, replaced, scalajs.runtime.toScalaVarArgs(mappedNewChildren): _*)
+    }
+
+    @inline
+    private[binding] final def spliceCache(from: Int, mappedNewChildren: IterableOnce[A], replaced: Int) = {
+      cacheData.splice(from, replaced, Seq.from(mappedNewChildren): _*)
+    }
+
+    @inline
+    private[binding] final def indexOfCache(a: A): Int = {
+      cacheData.indexOf(a)
+    }
+
+  }
+}

Binding/jvm/build.sbt

@@ -0,0 +1 @@
+../shared/build.sbt

Binding/jvm/src/main/scala/com/thoughtworks/binding/BindingJvmOrJs.scala

@@ -0,0 +1,92 @@
+package com.thoughtworks.binding
+
+private[binding] object BindingJvmOrJs {
+
+  type ConstantsData[+A] = Seq[A]
+
+  @inline
+  def toConstantsData[A](seq: IterableOnce[A]) = Seq.from(seq)
+
+  def toCacheData[A](seq: collection.Iterable[A]) = Vector.from(seq)
+
+  def emptyCacheData[A]: HasCache[A]#Cache = Vector.empty
+
+  trait HasCache[A] {
+
+    private[binding] type Cache = Vector[A]
+
+    private[binding] var cacheData: Cache
+
+    @inline
+    private[binding] final def getCache(n: Int): A = cacheData(n)
+
+    @inline
+    private[binding] final def updateCache(n: Int, newelem: A): Unit = {
+      cacheData = cacheData.updated(n, newelem)
+    }
+
+    @inline
+    private[binding] final def cacheLength: Int = cacheData.length
+
+    @inline
+    private[binding] final def clearCache(): Unit = {
+      cacheData = Vector.empty
+    }
+
+    private[binding] final def removeCache(n: Int): A = {
+      val result = cacheData(n)
+      cacheData = cacheData.patch(n, Nil, 1)
+      result
+    }
+
+    private[binding] final def removeCache(idx: Int, count: Int): Unit = {
+      cacheData = cacheData.patch(idx, Nil, count)
+    }
+
+    private[binding] final def appendCache(elements: IterableOnce[A]): Seq[A] = {
+      val seq = Seq.from(elements)
+      cacheData = cacheData ++ seq
+      seq
+    }
+
+    private[binding] final def appendCache(elem: A): Unit = {
+      cacheData = cacheData :+ elem
+    }
+
+    private[binding] final def prependCache(elem: A): Unit = {
+      cacheData = elem +: cacheData
+    }
+
+    private[binding] final def insertCache(n: Int, elems: IterableOnce[A]): Seq[A] = {
+      val seq = Seq.from(elems)
+      cacheData = cacheData.patch(n, seq, 0)
+      seq
+    }
+
+    private[binding] final def insertOneCache(n: Int, elem: A): Seq[A] = {
+      val seq = Seq(elem)
+      cacheData = cacheData.patch(n, seq, 0)
+      seq
+    }
+
+    private[binding] final def cacheIterator: Iterator[A] = {
+      cacheData.iterator
+    }
+
+    private[binding] final def spliceCache(from: Int, mappedNewChildren: IterableOnce[A], replaced: Int) = {
+      val oldCache = cacheData
+      if (from == 0) {
+        cacheData = mappedNewChildren ++: oldCache.drop(replaced)
+      } else {
+        cacheData = oldCache.patch(from, mappedNewChildren, replaced)
+      }
+      oldCache.view.slice(from, from + replaced)
+    }
+
+    private[binding] final def indexOfCache[B >: A](a: B): Int = {
+      cacheData.indexOf(a)
+    }
+
+  }
+
+}