Merge pull request #659 from robstoll/rename-scala-to-scala2

Rename scala to scala2

.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

.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

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

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

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 {

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
 

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
+
 }

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._

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

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
 

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'

build.gradle

@@ -521,7 +521,7 @@ task publishForScala(description: 'fast publish to maven local for scala project
 
 gradle.taskGraph.whenReady { graph ->
     if (graph.hasTask(':publishForScala')) {
-        ['test', 'dokka', 'signTutteliPublication'].forEach {
+        ['test', 'dokka', 'signTutteliPublication', 'validateBeforePublish', 'javadocJar', 'sourcesJar'].forEach {
             getSubprojectTasks(it).forEach { it.enabled = false }
         }
     }

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 {

misc/tools/atrium-scala2-test/settings.gradle

@@ -18,4 +18,4 @@ includeBuild('../../../') {
                 }
     }
 }
-includeBuild '../../../atrium-scala/'
+includeBuild '../../../atrium-scala2/'