From 46d771b2fb3cbb9d257561bfb6a69f4fb2b2fb25 Mon Sep 17 00:00:00 2001 From: Przemek Jakubczyk Date: Mon, 26 Oct 2015 21:25:29 +0100 Subject: [PATCH 1/4] Bump to version 1.0 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 0fa7cb3..260496a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version=0.9.0-SNAPSHOT +version=1.0.0 artifactId=robospock group=org.robospock From f77438ac54ce54a9e733ce08546ef7dc410e139f Mon Sep 17 00:00:00 2001 From: Przemek Jakubczyk Date: Mon, 26 Oct 2015 21:25:43 +0100 Subject: [PATCH 2/4] Bump to Spock v. 1.0 --- robospock/build.gradle | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/robospock/build.gradle b/robospock/build.gradle index 5b1cc3a..4fb65ac 100644 --- a/robospock/build.gradle +++ b/robospock/build.gradle @@ -20,8 +20,7 @@ sourceSets { } dependencies { - compile "org.codehaus.groovy:groovy-all:2.3.8" - compile "org.spockframework:spock-core:0.7-groovy-2.0" + compile "org.spockframework:spock-core:1.0-groovy-2.4" // Android part compile "org.robolectric:robolectric:3.0" From f437a030af733ccfb151e2b049be593424c8e4c1 Mon Sep 17 00:00:00 2001 From: Przemek Jakubczyk Date: Mon, 26 Oct 2015 21:26:03 +0100 Subject: [PATCH 3/4] package rename to org.robospock --- .../groovy/org/robospock/GradleRoboSpecification.groovy | 8 ++++++++ .../main/groovy/org/robospock/RoboSpecification.groovy | 7 +++++++ .../pl/polidea/robospock/GradleRoboSpecification.groovy | 4 +++- .../groovy/pl/polidea/robospock/RoboSpecification.groovy | 3 ++- .../internal => org/robospock}/GradleRoboSputnik.java | 2 +- .../robospock}/ParallelUniverseCompat.java | 2 +- .../internal => org/robospock}/RoboSpockInterceptor.java | 2 +- .../robospock/internal => org/robospock}/RoboSputnik.java | 2 +- .../test/integration/ActivityCreationTest.groovy | 4 ++-- .../test/groovy/com/example/robospock/DefaultSpec.groovy | 2 +- .../test/groovy/com/example/robospock/ShadowSpec.groovy | 2 +- 11 files changed, 28 insertions(+), 10 deletions(-) create mode 100644 robospock/src/main/groovy/org/robospock/GradleRoboSpecification.groovy create mode 100644 robospock/src/main/groovy/org/robospock/RoboSpecification.groovy rename robospock/src/main/java/{pl/polidea/robospock/internal => org/robospock}/GradleRoboSputnik.java (98%) rename robospock/src/main/java/{pl/polidea/robospock/internal => org/robospock}/ParallelUniverseCompat.java (99%) rename robospock/src/main/java/{pl/polidea/robospock/internal => org/robospock}/RoboSpockInterceptor.java (99%) rename robospock/src/main/java/{pl/polidea/robospock/internal => org/robospock}/RoboSputnik.java (99%) rename robospock/src/test/groovy/{pl/polidea => org}/robospock/test/integration/ActivityCreationTest.groovy (87%) diff --git a/robospock/src/main/groovy/org/robospock/GradleRoboSpecification.groovy b/robospock/src/main/groovy/org/robospock/GradleRoboSpecification.groovy new file mode 100644 index 0000000..3f4ae65 --- /dev/null +++ b/robospock/src/main/groovy/org/robospock/GradleRoboSpecification.groovy @@ -0,0 +1,8 @@ +package org.robospock + +import org.junit.runner.RunWith +import spock.lang.Specification + +@RunWith(GradleRoboSputnik) +class GradleRoboSpecification extends Specification { +} diff --git a/robospock/src/main/groovy/org/robospock/RoboSpecification.groovy b/robospock/src/main/groovy/org/robospock/RoboSpecification.groovy new file mode 100644 index 0000000..9f1edb5 --- /dev/null +++ b/robospock/src/main/groovy/org/robospock/RoboSpecification.groovy @@ -0,0 +1,7 @@ +package org.robospock + +import org.junit.runner.RunWith +import spock.lang.Specification + +@RunWith(RoboSputnik) +class RoboSpecification extends Specification {} diff --git a/robospock/src/main/groovy/pl/polidea/robospock/GradleRoboSpecification.groovy b/robospock/src/main/groovy/pl/polidea/robospock/GradleRoboSpecification.groovy index 6bac508..4fb2fce 100644 --- a/robospock/src/main/groovy/pl/polidea/robospock/GradleRoboSpecification.groovy +++ b/robospock/src/main/groovy/pl/polidea/robospock/GradleRoboSpecification.groovy @@ -1,9 +1,11 @@ package pl.polidea.robospock import org.junit.runner.RunWith -import pl.polidea.robospock.internal.GradleRoboSputnik +import org.robospock.GradleRoboSputnik import spock.lang.Specification + @RunWith(GradleRoboSputnik) +@Deprecated class GradleRoboSpecification extends Specification { } diff --git a/robospock/src/main/groovy/pl/polidea/robospock/RoboSpecification.groovy b/robospock/src/main/groovy/pl/polidea/robospock/RoboSpecification.groovy index 4b0b572..e8e15c3 100644 --- a/robospock/src/main/groovy/pl/polidea/robospock/RoboSpecification.groovy +++ b/robospock/src/main/groovy/pl/polidea/robospock/RoboSpecification.groovy @@ -1,8 +1,9 @@ package pl.polidea.robospock import org.junit.runner.RunWith -import pl.polidea.robospock.internal.RoboSputnik +import org.robospock.RoboSputnik import spock.lang.Specification @RunWith(RoboSputnik) +@Deprecated class RoboSpecification extends Specification {} diff --git a/robospock/src/main/java/pl/polidea/robospock/internal/GradleRoboSputnik.java b/robospock/src/main/java/org/robospock/GradleRoboSputnik.java similarity index 98% rename from robospock/src/main/java/pl/polidea/robospock/internal/GradleRoboSputnik.java rename to robospock/src/main/java/org/robospock/GradleRoboSputnik.java index 00ff7ee..ff3fa17 100644 --- a/robospock/src/main/java/pl/polidea/robospock/internal/GradleRoboSputnik.java +++ b/robospock/src/main/java/org/robospock/GradleRoboSputnik.java @@ -1,4 +1,4 @@ -package pl.polidea.robospock.internal; +package org.robospock; import org.junit.runners.model.InitializationError; import org.robolectric.annotation.Config; diff --git a/robospock/src/main/java/pl/polidea/robospock/internal/ParallelUniverseCompat.java b/robospock/src/main/java/org/robospock/ParallelUniverseCompat.java similarity index 99% rename from robospock/src/main/java/pl/polidea/robospock/internal/ParallelUniverseCompat.java rename to robospock/src/main/java/org/robospock/ParallelUniverseCompat.java index ddd213b..937f01d 100644 --- a/robospock/src/main/java/pl/polidea/robospock/internal/ParallelUniverseCompat.java +++ b/robospock/src/main/java/org/robospock/ParallelUniverseCompat.java @@ -1,4 +1,4 @@ -package pl.polidea.robospock.internal; +package org.robospock; import android.app.Application; import android.content.Context; diff --git a/robospock/src/main/java/pl/polidea/robospock/internal/RoboSpockInterceptor.java b/robospock/src/main/java/org/robospock/RoboSpockInterceptor.java similarity index 99% rename from robospock/src/main/java/pl/polidea/robospock/internal/RoboSpockInterceptor.java rename to robospock/src/main/java/org/robospock/RoboSpockInterceptor.java index d9711f2..96884b3 100644 --- a/robospock/src/main/java/pl/polidea/robospock/internal/RoboSpockInterceptor.java +++ b/robospock/src/main/java/org/robospock/RoboSpockInterceptor.java @@ -1,4 +1,4 @@ -package pl.polidea.robospock.internal; +package org.robospock; import android.app.Application; import android.os.Build; diff --git a/robospock/src/main/java/pl/polidea/robospock/internal/RoboSputnik.java b/robospock/src/main/java/org/robospock/RoboSputnik.java similarity index 99% rename from robospock/src/main/java/pl/polidea/robospock/internal/RoboSputnik.java rename to robospock/src/main/java/org/robospock/RoboSputnik.java index b98d193..7bbdd45 100644 --- a/robospock/src/main/java/pl/polidea/robospock/internal/RoboSputnik.java +++ b/robospock/src/main/java/org/robospock/RoboSputnik.java @@ -1,4 +1,4 @@ -package pl.polidea.robospock.internal; +package org.robospock; import org.jetbrains.annotations.NotNull; import org.junit.runner.Description; diff --git a/robospock/src/test/groovy/pl/polidea/robospock/test/integration/ActivityCreationTest.groovy b/robospock/src/test/groovy/org/robospock/test/integration/ActivityCreationTest.groovy similarity index 87% rename from robospock/src/test/groovy/pl/polidea/robospock/test/integration/ActivityCreationTest.groovy rename to robospock/src/test/groovy/org/robospock/test/integration/ActivityCreationTest.groovy index 9bcfbc6..41e28f5 100644 --- a/robospock/src/test/groovy/pl/polidea/robospock/test/integration/ActivityCreationTest.groovy +++ b/robospock/src/test/groovy/org/robospock/test/integration/ActivityCreationTest.groovy @@ -1,8 +1,8 @@ -package pl.polidea.robospock.test.integration +package org.robospock.test.integration import android.app.Activity import org.robolectric.Robolectric -import pl.polidea.robospock.RoboSpecification +import org.robospock.RoboSpecification import spock.lang.Unroll class ActivityCreationTest extends RoboSpecification { diff --git a/sample/src/test/groovy/com/example/robospock/DefaultSpec.groovy b/sample/src/test/groovy/com/example/robospock/DefaultSpec.groovy index 9e6d295..4c44054 100644 --- a/sample/src/test/groovy/com/example/robospock/DefaultSpec.groovy +++ b/sample/src/test/groovy/com/example/robospock/DefaultSpec.groovy @@ -4,7 +4,7 @@ import com.example.robospock.activity.MainActivity import com.example.robospock.shadow.MyActivityManagerShadow import org.robolectric.Robolectric import org.robolectric.annotation.Config -import pl.polidea.robospock.GradleRoboSpecification +import org.robospock.GradleRoboSpecification @Config(shadows = [MyActivityManagerShadow], constants = BuildConfig) class DefaultSpec extends GradleRoboSpecification { diff --git a/sample/src/test/groovy/com/example/robospock/ShadowSpec.groovy b/sample/src/test/groovy/com/example/robospock/ShadowSpec.groovy index 8ad30eb..f0b0685 100644 --- a/sample/src/test/groovy/com/example/robospock/ShadowSpec.groovy +++ b/sample/src/test/groovy/com/example/robospock/ShadowSpec.groovy @@ -4,7 +4,7 @@ import com.example.robospock.activity.MainActivity import com.example.robospock.shadow.MyActivityManagerShadow import org.robolectric.Robolectric import org.robolectric.annotation.Config -import pl.polidea.robospock.RoboSpecification +import org.robospock.RoboSpecification @Config(shadows = [MyActivityManagerShadow], manifest = "src/main/AndroidManifest.xml") class ShadowSpec extends RoboSpecification { From 7e1dfec04b43dc909815518fca7c31b95c6f1451 Mon Sep 17 00:00:00 2001 From: Przemek Jakubczyk Date: Mon, 26 Oct 2015 21:36:46 +0100 Subject: [PATCH 4/4] Bringing back internal package --- .../main/groovy/org/robospock/GradleRoboSpecification.groovy | 1 + .../src/main/groovy/org/robospock/RoboSpecification.groovy | 1 + .../groovy/pl/polidea/robospock/GradleRoboSpecification.groovy | 2 +- .../main/groovy/pl/polidea/robospock/RoboSpecification.groovy | 2 +- .../java/org/robospock/{ => internal}/GradleRoboSputnik.java | 2 +- .../org/robospock/{ => internal}/ParallelUniverseCompat.java | 2 +- .../java/org/robospock/{ => internal}/RoboSpockInterceptor.java | 2 +- .../src/main/java/org/robospock/{ => internal}/RoboSputnik.java | 2 +- 8 files changed, 8 insertions(+), 6 deletions(-) rename robospock/src/main/java/org/robospock/{ => internal}/GradleRoboSputnik.java (99%) rename robospock/src/main/java/org/robospock/{ => internal}/ParallelUniverseCompat.java (99%) rename robospock/src/main/java/org/robospock/{ => internal}/RoboSpockInterceptor.java (99%) rename robospock/src/main/java/org/robospock/{ => internal}/RoboSputnik.java (99%) diff --git a/robospock/src/main/groovy/org/robospock/GradleRoboSpecification.groovy b/robospock/src/main/groovy/org/robospock/GradleRoboSpecification.groovy index 3f4ae65..5cd2457 100644 --- a/robospock/src/main/groovy/org/robospock/GradleRoboSpecification.groovy +++ b/robospock/src/main/groovy/org/robospock/GradleRoboSpecification.groovy @@ -1,6 +1,7 @@ package org.robospock import org.junit.runner.RunWith +import org.robospock.internal.GradleRoboSputnik import spock.lang.Specification @RunWith(GradleRoboSputnik) diff --git a/robospock/src/main/groovy/org/robospock/RoboSpecification.groovy b/robospock/src/main/groovy/org/robospock/RoboSpecification.groovy index 9f1edb5..df2c4df 100644 --- a/robospock/src/main/groovy/org/robospock/RoboSpecification.groovy +++ b/robospock/src/main/groovy/org/robospock/RoboSpecification.groovy @@ -1,6 +1,7 @@ package org.robospock import org.junit.runner.RunWith +import org.robospock.internal.RoboSputnik import spock.lang.Specification @RunWith(RoboSputnik) diff --git a/robospock/src/main/groovy/pl/polidea/robospock/GradleRoboSpecification.groovy b/robospock/src/main/groovy/pl/polidea/robospock/GradleRoboSpecification.groovy index 4fb2fce..317ad55 100644 --- a/robospock/src/main/groovy/pl/polidea/robospock/GradleRoboSpecification.groovy +++ b/robospock/src/main/groovy/pl/polidea/robospock/GradleRoboSpecification.groovy @@ -1,7 +1,7 @@ package pl.polidea.robospock import org.junit.runner.RunWith -import org.robospock.GradleRoboSputnik +import org.robospock.internal.GradleRoboSputnik import spock.lang.Specification diff --git a/robospock/src/main/groovy/pl/polidea/robospock/RoboSpecification.groovy b/robospock/src/main/groovy/pl/polidea/robospock/RoboSpecification.groovy index e8e15c3..1c7b615 100644 --- a/robospock/src/main/groovy/pl/polidea/robospock/RoboSpecification.groovy +++ b/robospock/src/main/groovy/pl/polidea/robospock/RoboSpecification.groovy @@ -1,7 +1,7 @@ package pl.polidea.robospock import org.junit.runner.RunWith -import org.robospock.RoboSputnik +import org.robospock.internal.RoboSputnik import spock.lang.Specification @RunWith(RoboSputnik) diff --git a/robospock/src/main/java/org/robospock/GradleRoboSputnik.java b/robospock/src/main/java/org/robospock/internal/GradleRoboSputnik.java similarity index 99% rename from robospock/src/main/java/org/robospock/GradleRoboSputnik.java rename to robospock/src/main/java/org/robospock/internal/GradleRoboSputnik.java index ff3fa17..cd395ff 100644 --- a/robospock/src/main/java/org/robospock/GradleRoboSputnik.java +++ b/robospock/src/main/java/org/robospock/internal/GradleRoboSputnik.java @@ -1,4 +1,4 @@ -package org.robospock; +package org.robospock.internal; import org.junit.runners.model.InitializationError; import org.robolectric.annotation.Config; diff --git a/robospock/src/main/java/org/robospock/ParallelUniverseCompat.java b/robospock/src/main/java/org/robospock/internal/ParallelUniverseCompat.java similarity index 99% rename from robospock/src/main/java/org/robospock/ParallelUniverseCompat.java rename to robospock/src/main/java/org/robospock/internal/ParallelUniverseCompat.java index 937f01d..947b768 100644 --- a/robospock/src/main/java/org/robospock/ParallelUniverseCompat.java +++ b/robospock/src/main/java/org/robospock/internal/ParallelUniverseCompat.java @@ -1,4 +1,4 @@ -package org.robospock; +package org.robospock.internal; import android.app.Application; import android.content.Context; diff --git a/robospock/src/main/java/org/robospock/RoboSpockInterceptor.java b/robospock/src/main/java/org/robospock/internal/RoboSpockInterceptor.java similarity index 99% rename from robospock/src/main/java/org/robospock/RoboSpockInterceptor.java rename to robospock/src/main/java/org/robospock/internal/RoboSpockInterceptor.java index 96884b3..a4d7a34 100644 --- a/robospock/src/main/java/org/robospock/RoboSpockInterceptor.java +++ b/robospock/src/main/java/org/robospock/internal/RoboSpockInterceptor.java @@ -1,4 +1,4 @@ -package org.robospock; +package org.robospock.internal; import android.app.Application; import android.os.Build; diff --git a/robospock/src/main/java/org/robospock/RoboSputnik.java b/robospock/src/main/java/org/robospock/internal/RoboSputnik.java similarity index 99% rename from robospock/src/main/java/org/robospock/RoboSputnik.java rename to robospock/src/main/java/org/robospock/internal/RoboSputnik.java index 7bbdd45..eb5e140 100644 --- a/robospock/src/main/java/org/robospock/RoboSputnik.java +++ b/robospock/src/main/java/org/robospock/internal/RoboSputnik.java @@ -1,4 +1,4 @@ -package org.robospock; +package org.robospock.internal; import org.jetbrains.annotations.NotNull; import org.junit.runner.Description;