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.
angellee177 · Oct 20, 2020 · 43cacae · 43cacae
1 parent 044edea
commit 43cacae
Show file tree

Hide file tree

Showing 23 changed files with 25 additions and 19 deletions.
diff --git 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
@@ -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 → atrium-scala2/.scalafmt.conf b/atrium-scala/.scalafmt.conf → atrium-scala2/.scalafmt.conf
diff --git a/...trium-scala-api-fluent-en_GB/build.gradle → ...rium-scala2-api-fluent-en_GB/build.gradle b/...trium-scala-api-fluent-en_GB/build.gradle → ...rium-scala2-api-fluent-en_GB/build.gradle
diff --git a/...pi/fluent/en_GB/scala/AnyAssertions.scala → ...ala2/api/fluent/en_GB/AnyAssertions.scala b/...pi/fluent/en_GB/scala/AnyAssertions.scala → ...ala2/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/...i/fluent/en_GB/scala/BaseAssertions.scala → ...la2/api/fluent/en_GB/BaseAssertions.scala b/...i/fluent/en_GB/scala/BaseAssertions.scala → ...la2/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/...luent/en_GB/scala/IsIterableHelpers.scala → .../api/fluent/en_GB/IsIterableHelpers.scala b/...luent/en_GB/scala/IsIterableHelpers.scala → .../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/...ableLikeElementComparableAssertions.scala → ...ableLikeElementComparableAssertions.scala b/...ableLikeElementComparableAssertions.scala → ...ableLikeElementComparableAssertions.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/api/fluent/en_GB/scala/scala.scala → ...trium/scala2/api/fluent/en_GB/scala.scala b/...atrium/api/fluent/en_GB/scala/scala.scala → ...trium/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/...luent/en_GB/scala/AnyAssertionsSpec.scala → .../api/fluent/en_GB/AnyAssertionsSpec.scala b/...luent/en_GB/scala/AnyAssertionsSpec.scala → .../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/.../IterableLikeElementComparableSpecs.scala → .../IterableLIkeElementComparableSpecs.scala b/.../IterableLikeElementComparableSpecs.scala → .../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/...um/api/fluent/en_GB/scala/TestUtils.scala → ...m/scala2/api/fluent/en_GB/TestUtils.scala b/...um/api/fluent/en_GB/scala/TestUtils.scala → ...m/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 → atrium-scala2/build.gradle b/atrium-scala/build.gradle → atrium-scala2/build.gradle
diff --git a/...m-scala/gradle/wrapper/gradle-wrapper.jar → ...-scala2/gradle/wrapper/gradle-wrapper.jar b/...m-scala/gradle/wrapper/gradle-wrapper.jar → ...-scala2/gradle/wrapper/gradle-wrapper.jar
diff --git a/.../gradle/wrapper/gradle-wrapper.properties → .../gradle/wrapper/gradle-wrapper.properties b/.../gradle/wrapper/gradle-wrapper.properties → .../gradle/wrapper/gradle-wrapper.properties
diff --git a/atrium-scala/gradlew → atrium-scala2/gradlew b/atrium-scala/gradlew → atrium-scala2/gradlew
diff --git a/atrium-scala/settings.gradle → atrium-scala2/settings.gradle b/atrium-scala/settings.gradle → 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 → misc/tools/atrium-scala2-test/build.gradle b/misc/tools/atrium-scala-test/build.gradle → 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/...la-test/gradle/wrapper/gradle-wrapper.jar → ...a2-test/gradle/wrapper/gradle-wrapper.jar b/...la-test/gradle/wrapper/gradle-wrapper.jar → ...a2-test/gradle/wrapper/gradle-wrapper.jar
diff --git a/.../gradle/wrapper/gradle-wrapper.properties → .../gradle/wrapper/gradle-wrapper.properties b/.../gradle/wrapper/gradle-wrapper.properties → .../gradle/wrapper/gradle-wrapper.properties
diff --git a/misc/tools/atrium-scala-test/gradlew → misc/tools/atrium-scala2-test/gradlew b/misc/tools/atrium-scala-test/gradlew → misc/tools/atrium-scala2-test/gradlew
diff --git a/misc/tools/atrium-scala-test/gradlew.bat → misc/tools/atrium-scala2-test/gradlew.bat b/misc/tools/atrium-scala-test/gradlew.bat → misc/tools/atrium-scala2-test/gradlew.bat
diff --git a/misc/tools/atrium-scala-test/settings.gradle → .../tools/atrium-scala2-test/settings.gradle b/misc/tools/atrium-scala-test/settings.gradle → .../tools/atrium-scala2-test/settings.gradle
@@ -18,4 +18,4 @@ includeBuild('../../../') {
                 }
     }
 }
-includeBuild '../../../atrium-scala/'
+includeBuild '../../../atrium-scala2/'