Merge pull request #54 from robospock/package_rename

Package rename
robospock · Oct 27, 2015 · 64b88b1 · 64b88b1
2 parents 0213638 + 7e1dfec
commit 64b88b1
Show file tree

Hide file tree

Showing 13 changed files with 32 additions and 13 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-version=0.9.0-SNAPSHOT
+version=1.0.0
 
 artifactId=robospock
 group=org.robospock

diff --git 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"

diff --git a/robospock/src/main/groovy/org/robospock/GradleRoboSpecification.groovy b/robospock/src/main/groovy/org/robospock/GradleRoboSpecification.groovy
@@ -0,0 +1,9 @@
+package org.robospock
+
+import org.junit.runner.RunWith
+import org.robospock.internal.GradleRoboSputnik
+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
@@ -0,0 +1,8 @@
+package org.robospock
+
+import org.junit.runner.RunWith
+import org.robospock.internal.RoboSputnik
+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
@@ -1,9 +1,11 @@
 package pl.polidea.robospock
 
 import org.junit.runner.RunWith
-import pl.polidea.robospock.internal.GradleRoboSputnik
+import org.robospock.internal.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
@@ -1,8 +1,9 @@
 package pl.polidea.robospock
 
 import org.junit.runner.RunWith
-import pl.polidea.robospock.internal.RoboSputnik
+import org.robospock.internal.RoboSputnik
 import spock.lang.Specification
 
 @RunWith(RoboSputnik)
+@Deprecated
 class RoboSpecification extends Specification {}
diff --git a/...robospock/internal/GradleRoboSputnik.java → ...robospock/internal/GradleRoboSputnik.java b/...robospock/internal/GradleRoboSputnik.java → ...robospock/internal/GradleRoboSputnik.java
@@ -1,4 +1,4 @@
-package pl.polidea.robospock.internal;
+package org.robospock.internal;
 
 import org.junit.runners.model.InitializationError;
 import org.robolectric.annotation.Config;

diff --git a/...pock/internal/ParallelUniverseCompat.java → ...pock/internal/ParallelUniverseCompat.java b/...pock/internal/ParallelUniverseCompat.java → ...pock/internal/ParallelUniverseCompat.java
@@ -1,4 +1,4 @@
-package pl.polidea.robospock.internal;
+package org.robospock.internal;
 
 import android.app.Application;
 import android.content.Context;

diff --git a/...ospock/internal/RoboSpockInterceptor.java → ...ospock/internal/RoboSpockInterceptor.java b/...ospock/internal/RoboSpockInterceptor.java → ...ospock/internal/RoboSpockInterceptor.java
@@ -1,4 +1,4 @@
-package pl.polidea.robospock.internal;
+package org.robospock.internal;
 
 import android.app.Application;
 import android.os.Build;

diff --git a/...lidea/robospock/internal/RoboSputnik.java → ...a/org/robospock/internal/RoboSputnik.java b/...lidea/robospock/internal/RoboSputnik.java → ...a/org/robospock/internal/RoboSputnik.java
@@ -1,4 +1,4 @@
-package pl.polidea.robospock.internal;
+package org.robospock.internal;
 
 import org.jetbrains.annotations.NotNull;
 import org.junit.runner.Description;

diff --git a/...t/integration/ActivityCreationTest.groovy → ...t/integration/ActivityCreationTest.groovy b/...t/integration/ActivityCreationTest.groovy → ...t/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
@@ -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
@@ -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 {