From 43cacaee8801b16eb5d4a5fe6b7a9f7e30d5cb1a Mon Sep 17 00:00:00 2001
From: Robert Stoll <robert.stoll@tegonal.com>
Date: Thu, 30 Jul 2020 22:14:48 +0200
Subject: [PATCH] rename atrium-scala to atrium-scala2 and change package
 structure

Don't prefix packages with scala but move it after ch.tutteli.atrium.
IMO it is not an extension like kotlin_1_3 and therefore should
not be at the end. Use scala2 as we are likely going to use atrium-scala
for scala 3 once it is out.
---
 .github/workflows/java-windows.yml                  |   4 ++--
 .travis.yml                                         |   2 +-
 {atrium-scala => atrium-scala2}/.scalafmt.conf      |   0
 .../atrium-scala2-api-fluent-en_GB}/build.gradle    |   0
 .../scala2/api/fluent/en_GB}/AnyAssertions.scala    |   2 +-
 .../scala2/api/fluent/en_GB}/BaseAssertions.scala   |   2 +-
 .../api/fluent/en_GB}/IsIterableHelpers.scala       |   3 ++-
 .../IterableLikeElementComparableAssertions.scala   |   5 +++--
 .../atrium/scala2/api/fluent/en_GB}/scala.scala     |   7 ++++---
 .../api/fluent/en_GB}/AnyAssertionsSpec.scala       |   2 +-
 .../en_GB/IterableLIkeElementComparableSpecs.scala  |   7 +++++--
 .../atrium/scala2/api/fluent/en_GB}/TestUtils.scala |   2 +-
 {atrium-scala => atrium-scala2}/build.gradle        |   0
 .../gradle/wrapper/gradle-wrapper.jar               | Bin
 .../gradle/wrapper/gradle-wrapper.properties        |   0
 {atrium-scala => atrium-scala2}/gradlew             |   0
 {atrium-scala => atrium-scala2}/settings.gradle     |   2 +-
 .../build.gradle                                    |   4 ++--
 .../gradle/wrapper/gradle-wrapper.jar               | Bin
 .../gradle/wrapper/gradle-wrapper.properties        |   0
 .../gradlew                                         |   0
 .../gradlew.bat                                     |   0
 .../settings.gradle                                 |   2 +-
 23 files changed, 25 insertions(+), 19 deletions(-)
 rename {atrium-scala => atrium-scala2}/.scalafmt.conf (100%)
 rename {atrium-scala/apis/atrium-scala-api-fluent-en_GB => atrium-scala2/apis/atrium-scala2-api-fluent-en_GB}/build.gradle (100%)
 rename {atrium-scala/apis/atrium-scala-api-fluent-en_GB/src/main/scala/ch/tutteli/atrium/api/fluent/en_GB/scala => atrium-scala2/apis/atrium-scala2-api-fluent-en_GB/src/main/scala/ch/tutteli/atrium/scala2/api/fluent/en_GB}/AnyAssertions.scala (97%)
 rename {atrium-scala/apis/atrium-scala-api-fluent-en_GB/src/main/scala/ch/tutteli/atrium/api/fluent/en_GB/scala => atrium-scala2/apis/atrium-scala2-api-fluent-en_GB/src/main/scala/ch/tutteli/atrium/scala2/api/fluent/en_GB}/BaseAssertions.scala (85%)
 rename {atrium-scala/apis/atrium-scala-api-fluent-en_GB/src/main/scala/ch/tutteli/atrium/api/fluent/en_GB/scala => atrium-scala2/apis/atrium-scala2-api-fluent-en_GB/src/main/scala/ch/tutteli/atrium/scala2/api/fluent/en_GB}/IsIterableHelpers.scala (95%)
 rename {atrium-scala/apis/atrium-scala-api-fluent-en_GB/src/main/scala/ch/tutteli/atrium/api/fluent/en_GB/scala => atrium-scala2/apis/atrium-scala2-api-fluent-en_GB/src/main/scala/ch/tutteli/atrium/scala2/api/fluent/en_GB}/IterableLikeElementComparableAssertions.scala (89%)
 rename {atrium-scala/apis/atrium-scala-api-fluent-en_GB/src/main/scala/ch/tutteli/atrium/api/fluent/en_GB/scala => atrium-scala2/apis/atrium-scala2-api-fluent-en_GB/src/main/scala/ch/tutteli/atrium/scala2/api/fluent/en_GB}/scala.scala (96%)
 rename {atrium-scala/apis/atrium-scala-api-fluent-en_GB/src/test/scala/ch/tutteli/atrium/api/fluent/en_GB/scala => atrium-scala2/apis/atrium-scala2-api-fluent-en_GB/src/test/scala/ch/tutteli/atrium/scala2/api/fluent/en_GB}/AnyAssertionsSpec.scala (97%)
 rename atrium-scala/apis/atrium-scala-api-fluent-en_GB/src/test/scala/ch/tutteli/atrium/api/fluent/en_GB/scala/IterableLikeElementComparableSpecs.scala => atrium-scala2/apis/atrium-scala2-api-fluent-en_GB/src/test/scala/ch/tutteli/atrium/scala2/api/fluent/en_GB/IterableLIkeElementComparableSpecs.scala (91%)
 rename {atrium-scala/apis/atrium-scala-api-fluent-en_GB/src/test/scala/ch/tutteli/atrium/api/fluent/en_GB/scala => atrium-scala2/apis/atrium-scala2-api-fluent-en_GB/src/test/scala/ch/tutteli/atrium/scala2/api/fluent/en_GB}/TestUtils.scala (98%)
 rename {atrium-scala => atrium-scala2}/build.gradle (100%)
 rename {atrium-scala => atrium-scala2}/gradle/wrapper/gradle-wrapper.jar (100%)
 rename {atrium-scala => atrium-scala2}/gradle/wrapper/gradle-wrapper.properties (100%)
 rename {atrium-scala => atrium-scala2}/gradlew (100%)
 rename {atrium-scala => atrium-scala2}/settings.gradle (92%)
 rename misc/tools/{atrium-scala-test => atrium-scala2-test}/build.gradle (75%)
 rename misc/tools/{atrium-scala-test => atrium-scala2-test}/gradle/wrapper/gradle-wrapper.jar (100%)
 rename misc/tools/{atrium-scala-test => atrium-scala2-test}/gradle/wrapper/gradle-wrapper.properties (100%)
 rename misc/tools/{atrium-scala-test => atrium-scala2-test}/gradlew (100%)
 rename misc/tools/{atrium-scala-test => atrium-scala2-test}/gradlew.bat (100%)
 rename misc/tools/{atrium-scala-test => atrium-scala2-test}/settings.gradle (94%)

diff --git a/.github/workflows/java-windows.yml b/.github/workflows/java-windows.yml
index e27f410dd..ceca94f5f 100644
--- a/.github/workflows/java-windows.yml
+++ b/.github/workflows/java-windows.yml
@@ -47,9 +47,9 @@ jobs:
                 run: ATRIUM_ANDROID_JAR="$PWD/android-jar-cache/android.jar" ./gradlew checkDexer
                 shell: bash
 
-            -   name: composite build atrium-scala
+            -   name: composite build atrium-scala2
                 run: ./gradlew build
-                working-directory: misc\tools\atrium-scala-test
+                working-directory: misc\tools\atrium-scala2-test
 
             -   name: Upload windows build code coverage
                 uses: codecov/codecov-action@v1
diff --git a/.travis.yml b/.travis.yml
index abeb4265d..a4aa2f934 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,7 @@ jobs:
             - set -e
             - ./gradle/scripts/check-generateLogic-committed.sh
             - ./gradlew buildAllWithoutJs
-            - misc/tools/atrium-scala-test/gradlew -p ./misc/tools/atrium-scala-test build
+            - misc/tools/atrium-scala2-test/gradlew -p ./misc/tools/atrium-scala2-test build
         after_success: bash <(curl -s https://codecov.io/bash) -F current
 
       - env: MODE=current_8
diff --git a/atrium-scala/.scalafmt.conf b/atrium-scala2/.scalafmt.conf
similarity index 100%
rename from atrium-scala/.scalafmt.conf
rename to atrium-scala2/.scalafmt.conf
diff --git a/atrium-scala/apis/atrium-scala-api-fluent-en_GB/build.gradle b/atrium-scala2/apis/atrium-scala2-api-fluent-en_GB/build.gradle
similarity index 100%
rename from atrium-scala/apis/atrium-scala-api-fluent-en_GB/build.gradle
rename to atrium-scala2/apis/atrium-scala2-api-fluent-en_GB/build.gradle
diff --git a/atrium-scala/apis/atrium-scala-api-fluent-en_GB/src/main/scala/ch/tutteli/atrium/api/fluent/en_GB/scala/AnyAssertions.scala b/atrium-scala2/apis/atrium-scala2-api-fluent-en_GB/src/main/scala/ch/tutteli/atrium/scala2/api/fluent/en_GB/AnyAssertions.scala
similarity index 97%
rename from atrium-scala/apis/atrium-scala-api-fluent-en_GB/src/main/scala/ch/tutteli/atrium/api/fluent/en_GB/scala/AnyAssertions.scala
rename to atrium-scala2/apis/atrium-scala2-api-fluent-en_GB/src/main/scala/ch/tutteli/atrium/scala2/api/fluent/en_GB/AnyAssertions.scala
index 39e39ca70..70c2f361f 100644
--- a/atrium-scala/apis/atrium-scala-api-fluent-en_GB/src/main/scala/ch/tutteli/atrium/api/fluent/en_GB/scala/AnyAssertions.scala
+++ b/atrium-scala2/apis/atrium-scala2-api-fluent-en_GB/src/main/scala/ch/tutteli/atrium/scala2/api/fluent/en_GB/AnyAssertions.scala
@@ -1,4 +1,4 @@
-package ch.tutteli.atrium.api.fluent.en_GB.scala
+package ch.tutteli.atrium.scala2.api.fluent.en_GB
 
 import ch.tutteli.atrium.assertions.Assertion
 import ch.tutteli.atrium.creating.Expect
diff --git a/atrium-scala/apis/atrium-scala-api-fluent-en_GB/src/main/scala/ch/tutteli/atrium/api/fluent/en_GB/scala/BaseAssertions.scala b/atrium-scala2/apis/atrium-scala2-api-fluent-en_GB/src/main/scala/ch/tutteli/atrium/scala2/api/fluent/en_GB/BaseAssertions.scala
similarity index 85%
rename from atrium-scala/apis/atrium-scala-api-fluent-en_GB/src/main/scala/ch/tutteli/atrium/api/fluent/en_GB/scala/BaseAssertions.scala
rename to atrium-scala2/apis/atrium-scala2-api-fluent-en_GB/src/main/scala/ch/tutteli/atrium/scala2/api/fluent/en_GB/BaseAssertions.scala
index e1c8865b6..e078aa2b8 100644
--- a/atrium-scala/apis/atrium-scala-api-fluent-en_GB/src/main/scala/ch/tutteli/atrium/api/fluent/en_GB/scala/BaseAssertions.scala
+++ b/atrium-scala2/apis/atrium-scala2-api-fluent-en_GB/src/main/scala/ch/tutteli/atrium/scala2/api/fluent/en_GB/BaseAssertions.scala
@@ -1,4 +1,4 @@
-package ch.tutteli.atrium.api.fluent.en_GB.scala
+package ch.tutteli.atrium.scala2.api.fluent.en_GB
 
 import ch.tutteli.atrium.creating.Expect
 import ch.tutteli.atrium.domain.creating.changers.PostFinalStep
diff --git a/atrium-scala/apis/atrium-scala-api-fluent-en_GB/src/main/scala/ch/tutteli/atrium/api/fluent/en_GB/scala/IsIterableHelpers.scala b/atrium-scala2/apis/atrium-scala2-api-fluent-en_GB/src/main/scala/ch/tutteli/atrium/scala2/api/fluent/en_GB/IsIterableHelpers.scala
similarity index 95%
rename from atrium-scala/apis/atrium-scala-api-fluent-en_GB/src/main/scala/ch/tutteli/atrium/api/fluent/en_GB/scala/IsIterableHelpers.scala
rename to atrium-scala2/apis/atrium-scala2-api-fluent-en_GB/src/main/scala/ch/tutteli/atrium/scala2/api/fluent/en_GB/IsIterableHelpers.scala
index 502bdb93d..34df1d052 100644
--- a/atrium-scala/apis/atrium-scala-api-fluent-en_GB/src/main/scala/ch/tutteli/atrium/api/fluent/en_GB/scala/IsIterableHelpers.scala
+++ b/atrium-scala2/apis/atrium-scala2-api-fluent-en_GB/src/main/scala/ch/tutteli/atrium/scala2/api/fluent/en_GB/IsIterableHelpers.scala
@@ -1,8 +1,9 @@
-package ch.tutteli.atrium.api.fluent.en_GB.scala
+package ch.tutteli.atrium.scala2.api.fluent.en_GB
 
 import scala.collection.generic.IsIterable
 import ch.tutteli.atrium.creating.Expect
 import java.lang.{Iterable => JIterable}
+
 import scala.jdk.CollectionConverters._
 
 object IsIterableHelpers {
diff --git a/atrium-scala/apis/atrium-scala-api-fluent-en_GB/src/main/scala/ch/tutteli/atrium/api/fluent/en_GB/scala/IterableLikeElementComparableAssertions.scala b/atrium-scala2/apis/atrium-scala2-api-fluent-en_GB/src/main/scala/ch/tutteli/atrium/scala2/api/fluent/en_GB/IterableLikeElementComparableAssertions.scala
similarity index 89%
rename from atrium-scala/apis/atrium-scala-api-fluent-en_GB/src/main/scala/ch/tutteli/atrium/api/fluent/en_GB/scala/IterableLikeElementComparableAssertions.scala
rename to atrium-scala2/apis/atrium-scala2-api-fluent-en_GB/src/main/scala/ch/tutteli/atrium/scala2/api/fluent/en_GB/IterableLikeElementComparableAssertions.scala
index 7ea737f3c..fb6fcf33c 100644
--- a/atrium-scala/apis/atrium-scala-api-fluent-en_GB/src/main/scala/ch/tutteli/atrium/api/fluent/en_GB/scala/IterableLikeElementComparableAssertions.scala
+++ b/atrium-scala2/apis/atrium-scala2-api-fluent-en_GB/src/main/scala/ch/tutteli/atrium/scala2/api/fluent/en_GB/IterableLikeElementComparableAssertions.scala
@@ -1,7 +1,8 @@
-package ch.tutteli.atrium.api.fluent.en_GB.scala
+package ch.tutteli.atrium.scala2.api.fluent.en_GB
+
 import java.lang.{Iterable => JIterable}
 
-import ch.tutteli.atrium.api.fluent.en_GB.scala.IsIterableHelpers._
+import IsIterableHelpers._
 import ch.tutteli.atrium.creating.Expect
 import ch.tutteli.atrium.domain.builders.creating.IterableAssertionsBuilder
 
diff --git a/atrium-scala/apis/atrium-scala-api-fluent-en_GB/src/main/scala/ch/tutteli/atrium/api/fluent/en_GB/scala/scala.scala b/atrium-scala2/apis/atrium-scala2-api-fluent-en_GB/src/main/scala/ch/tutteli/atrium/scala2/api/fluent/en_GB/scala.scala
similarity index 96%
rename from atrium-scala/apis/atrium-scala-api-fluent-en_GB/src/main/scala/ch/tutteli/atrium/api/fluent/en_GB/scala/scala.scala
rename to atrium-scala2/apis/atrium-scala2-api-fluent-en_GB/src/main/scala/ch/tutteli/atrium/scala2/api/fluent/en_GB/scala.scala
index febd694b1..393fc6cb0 100644
--- a/atrium-scala/apis/atrium-scala-api-fluent-en_GB/src/main/scala/ch/tutteli/atrium/api/fluent/en_GB/scala/scala.scala
+++ b/atrium-scala2/apis/atrium-scala2-api-fluent-en_GB/src/main/scala/ch/tutteli/atrium/scala2/api/fluent/en_GB/scala.scala
@@ -1,11 +1,11 @@
-package ch.tutteli.atrium.api.fluent.en_GB
+package ch.tutteli.atrium.scala2.api.fluent
 
 import ch.tutteli.atrium.creating.Expect
 import ch.tutteli.atrium.domain.builders.ExpectImpl
 import _root_.scala.annotation.unchecked.uncheckedVariance
 import kotlin.reflect.KClass
 
-package object scala extends ScalaKotlinConversions {
+package object en_GB extends ScalaKotlinConversions {
   import IsIterableHelpers._
 
   @inline val ExpectImpl: ExpectImpl =
@@ -20,7 +20,7 @@ package object scala extends ScalaKotlinConversions {
 
 }
 
-package scala {
+package en_GB {
 
   import kotlin.jvm.internal.Reflection
 
@@ -105,4 +105,5 @@ package scala {
   }
 
   class KClassTag[T](val kClass: KClass[T]) extends AnyVal
+
 }
diff --git a/atrium-scala/apis/atrium-scala-api-fluent-en_GB/src/test/scala/ch/tutteli/atrium/api/fluent/en_GB/scala/AnyAssertionsSpec.scala b/atrium-scala2/apis/atrium-scala2-api-fluent-en_GB/src/test/scala/ch/tutteli/atrium/scala2/api/fluent/en_GB/AnyAssertionsSpec.scala
similarity index 97%
rename from atrium-scala/apis/atrium-scala-api-fluent-en_GB/src/test/scala/ch/tutteli/atrium/api/fluent/en_GB/scala/AnyAssertionsSpec.scala
rename to atrium-scala2/apis/atrium-scala2-api-fluent-en_GB/src/test/scala/ch/tutteli/atrium/scala2/api/fluent/en_GB/AnyAssertionsSpec.scala
index 1475054b4..f7e96ad62 100644
--- a/atrium-scala/apis/atrium-scala-api-fluent-en_GB/src/test/scala/ch/tutteli/atrium/api/fluent/en_GB/scala/AnyAssertionsSpec.scala
+++ b/atrium-scala2/apis/atrium-scala2-api-fluent-en_GB/src/test/scala/ch/tutteli/atrium/scala2/api/fluent/en_GB/AnyAssertionsSpec.scala
@@ -1,4 +1,4 @@
-package ch.tutteli.atrium.api.fluent.en_GB.scala
+package ch.tutteli.atrium.scala2.api.fluent.en_GB
 
 import TestUtils._
 import AnyAssertionsSpec._
diff --git a/atrium-scala/apis/atrium-scala-api-fluent-en_GB/src/test/scala/ch/tutteli/atrium/api/fluent/en_GB/scala/IterableLikeElementComparableSpecs.scala b/atrium-scala2/apis/atrium-scala2-api-fluent-en_GB/src/test/scala/ch/tutteli/atrium/scala2/api/fluent/en_GB/IterableLIkeElementComparableSpecs.scala
similarity index 91%
rename from atrium-scala/apis/atrium-scala-api-fluent-en_GB/src/test/scala/ch/tutteli/atrium/api/fluent/en_GB/scala/IterableLikeElementComparableSpecs.scala
rename to atrium-scala2/apis/atrium-scala2-api-fluent-en_GB/src/test/scala/ch/tutteli/atrium/scala2/api/fluent/en_GB/IterableLIkeElementComparableSpecs.scala
index 397ed46c3..7493e8563 100644
--- a/atrium-scala/apis/atrium-scala-api-fluent-en_GB/src/test/scala/ch/tutteli/atrium/api/fluent/en_GB/scala/IterableLikeElementComparableSpecs.scala
+++ b/atrium-scala2/apis/atrium-scala2-api-fluent-en_GB/src/test/scala/ch/tutteli/atrium/scala2/api/fluent/en_GB/IterableLIkeElementComparableSpecs.scala
@@ -1,9 +1,12 @@
-package ch.tutteli.atrium.api.fluent.en_GB.scala
+package ch.tutteli.atrium.scala2.api.fluent.en_GB
 
+import TestUtils._
 import ch.tutteli.atrium.creating.Expect
 import java.lang.{Iterable => JIterable}
-import scala.reflect.ClassTag
 
+import scala.reflect.ClassTag
+import IterableFeatureAssertionsSpec._
+import IsIterableHelpers._
 
 // FIXME rewrite after fusing IterableFutureAssertionsSpec with IterableAssertionsSpecr
 //class IterableFeatureAssertionsSpec
diff --git a/atrium-scala/apis/atrium-scala-api-fluent-en_GB/src/test/scala/ch/tutteli/atrium/api/fluent/en_GB/scala/TestUtils.scala b/atrium-scala2/apis/atrium-scala2-api-fluent-en_GB/src/test/scala/ch/tutteli/atrium/scala2/api/fluent/en_GB/TestUtils.scala
similarity index 98%
rename from atrium-scala/apis/atrium-scala-api-fluent-en_GB/src/test/scala/ch/tutteli/atrium/api/fluent/en_GB/scala/TestUtils.scala
rename to atrium-scala2/apis/atrium-scala2-api-fluent-en_GB/src/test/scala/ch/tutteli/atrium/scala2/api/fluent/en_GB/TestUtils.scala
index f95bb5a56..3ae49379a 100644
--- a/atrium-scala/apis/atrium-scala-api-fluent-en_GB/src/test/scala/ch/tutteli/atrium/api/fluent/en_GB/scala/TestUtils.scala
+++ b/atrium-scala2/apis/atrium-scala2-api-fluent-en_GB/src/test/scala/ch/tutteli/atrium/scala2/api/fluent/en_GB/TestUtils.scala
@@ -1,4 +1,4 @@
-package ch.tutteli.atrium.api.fluent.en_GB.scala
+package ch.tutteli.atrium.scala2.api.fluent.en_GB
 
 import ch.tutteli.atrium.creating.Expect
 
diff --git a/atrium-scala/build.gradle b/atrium-scala2/build.gradle
similarity index 100%
rename from atrium-scala/build.gradle
rename to atrium-scala2/build.gradle
diff --git a/atrium-scala/gradle/wrapper/gradle-wrapper.jar b/atrium-scala2/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from atrium-scala/gradle/wrapper/gradle-wrapper.jar
rename to atrium-scala2/gradle/wrapper/gradle-wrapper.jar
diff --git a/atrium-scala/gradle/wrapper/gradle-wrapper.properties b/atrium-scala2/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from atrium-scala/gradle/wrapper/gradle-wrapper.properties
rename to atrium-scala2/gradle/wrapper/gradle-wrapper.properties
diff --git a/atrium-scala/gradlew b/atrium-scala2/gradlew
similarity index 100%
rename from atrium-scala/gradlew
rename to atrium-scala2/gradlew
diff --git a/atrium-scala/settings.gradle b/atrium-scala2/settings.gradle
similarity index 92%
rename from atrium-scala/settings.gradle
rename to atrium-scala2/settings.gradle
index cf29fece8..1c04ff102 100644
--- a/atrium-scala/settings.gradle
+++ b/atrium-scala2/settings.gradle
@@ -1,4 +1,4 @@
-rootProject.name = 'atrium-scala'
+rootProject.name = 'atrium-scala2'
 
 buildscript {
     gradle.ext.tutteli_plugins_version = '0.32.2'
diff --git a/misc/tools/atrium-scala-test/build.gradle b/misc/tools/atrium-scala2-test/build.gradle
similarity index 75%
rename from misc/tools/atrium-scala-test/build.gradle
rename to misc/tools/atrium-scala2-test/build.gradle
index fefe31ae1..f5f284fa0 100644
--- a/misc/tools/atrium-scala-test/build.gradle
+++ b/misc/tools/atrium-scala2-test/build.gradle
@@ -5,11 +5,11 @@ def dependsOnTask = { self, String projectName, String taskName ->
 }
 
 task build {
-    dependsOnTask(delegate, 'atrium-scala', 'build')
+    dependsOnTask(delegate, 'atrium-scala2', 'build')
 }
 
 task clean {
-    dependsOnTask(delegate, 'atrium-scala', 'clean')
+    dependsOnTask(delegate, 'atrium-scala2', 'clean')
 }
 
 task cleanAtrium {
diff --git a/misc/tools/atrium-scala-test/gradle/wrapper/gradle-wrapper.jar b/misc/tools/atrium-scala2-test/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from misc/tools/atrium-scala-test/gradle/wrapper/gradle-wrapper.jar
rename to misc/tools/atrium-scala2-test/gradle/wrapper/gradle-wrapper.jar
diff --git a/misc/tools/atrium-scala-test/gradle/wrapper/gradle-wrapper.properties b/misc/tools/atrium-scala2-test/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from misc/tools/atrium-scala-test/gradle/wrapper/gradle-wrapper.properties
rename to misc/tools/atrium-scala2-test/gradle/wrapper/gradle-wrapper.properties
diff --git a/misc/tools/atrium-scala-test/gradlew b/misc/tools/atrium-scala2-test/gradlew
similarity index 100%
rename from misc/tools/atrium-scala-test/gradlew
rename to misc/tools/atrium-scala2-test/gradlew
diff --git a/misc/tools/atrium-scala-test/gradlew.bat b/misc/tools/atrium-scala2-test/gradlew.bat
similarity index 100%
rename from misc/tools/atrium-scala-test/gradlew.bat
rename to misc/tools/atrium-scala2-test/gradlew.bat
diff --git a/misc/tools/atrium-scala-test/settings.gradle b/misc/tools/atrium-scala2-test/settings.gradle
similarity index 94%
rename from misc/tools/atrium-scala-test/settings.gradle
rename to misc/tools/atrium-scala2-test/settings.gradle
index bcf9ef8c0..ce80b6c9e 100644
--- a/misc/tools/atrium-scala-test/settings.gradle
+++ b/misc/tools/atrium-scala2-test/settings.gradle
@@ -18,4 +18,4 @@ includeBuild('../../../') {
                 }
     }
 }
-includeBuild '../../../atrium-scala/'
+includeBuild '../../../atrium-scala2/'