Skip to content

Commit 3b8a8cc

Browse files
committed
refactor org to com.github.jw3
1 parent a3da43d commit 3b8a8cc

24 files changed

+52
-51
lines changed

build.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
enablePlugins(GitVersioning)
33

4-
organization := "com.rxthings"
4+
organization := "com.github.jw3"
55
name := "akka-injects"
66
git.useGitDescribe := true
77
licenses +=("Apache-2.0", url("http://www.apache.org/licenses/LICENSE-2.0"))

src/main/scala/com/rxthings/di/ConfigModule.scala src/main/scala/com/github/jw3/di/ConfigModule.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.rxthings.di
1+
package com.github.jw3.di
22

33
import com.typesafe.config.Config
44
import net.codingwell.scalaguice.ScalaModule

src/main/scala/com/rxthings/di/InjectExt.scala src/main/scala/com/github/jw3/di/InjectExt.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.rxthings.di
1+
package com.github.jw3.di
22

33
import java.util.ServiceLoader
44

src/main/scala/com/rxthings/di/InjectionBuilder.scala src/main/scala/com/github/jw3/di/InjectionBuilder.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package com.rxthings.di
1+
package com.github.jw3.di
22

33
import javax.inject.Provider
44

55
import akka.actor._
66
import com.google.inject.{Injector, Key, TypeLiteral}
7-
import com.rxthings.di.Internals.BaseInjectionBuilder
7+
import Internals.BaseInjectionBuilder
88
import net.codingwell.scalaguice.InjectorExtensions._
99
import net.codingwell.scalaguice.KeyExtensions._
1010
import net.codingwell.scalaguice._

src/main/scala/com/rxthings/di/NamedConfigModule.scala src/main/scala/com/github/jw3/di/NamedConfigModule.scala

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
package com.rxthings.di
2-
1+
package com.github.jw3.di
32

43
import com.typesafe.config.ConfigValueType._
54
import com.typesafe.config.{Config, ConfigValue}

src/main/scala/com/rxthings/di/package.scala src/main/scala/com/github/jw3/di/package.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.rxthings
1+
package com.github.jw3
22

33
import akka.actor.{Actor, ActorContext, ActorRef, ActorSystem}
44
import com.google.inject.Injector
@@ -10,7 +10,7 @@ import scala.reflect.runtime.universe._
1010
* the inject API
1111
*/
1212
package object di {
13-
import com.rxthings.di.Internals._
13+
import Internals._
1414

1515
type InjectorProvider = () => Injector
1616

src/test/java/com/rxthings/di/test/BindingAnnotation1.java src/test/java/com/github/jw3/di/test/BindingAnnotation1.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.rxthings.di.test;
1+
package com.github.jw3.di.test;
22

33
import java.lang.annotation.Retention;
44
import java.lang.annotation.RetentionPolicy;
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.rxthings.di.test;
1+
package com.github.jw3.di.test;
22

33
import java.lang.annotation.Retention;
44
import java.lang.annotation.RetentionPolicy;
@@ -8,4 +8,4 @@
88
@BindingAnnotation
99
@Retention(RetentionPolicy.RUNTIME)
1010
public @interface BindingAnnotation2 {
11-
}
11+
}
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
com.rxthings.di.test.SpiModule1
2-
com.rxthings.di.test.SpiModule2
1+
com.github.jw3.di.test.SpiModule1
2+
com.github.jw3.di.test.SpiModule2

src/test/scala/com/rxthings/di/AnnotatedInjectionSpec.scala src/test/scala/com/github/jw3/di/AnnotatedInjectionSpec.scala

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
package com.rxthings.di
1+
package com.github.jw3.di
22

33
import java.util.UUID
44

55
import akka.actor.ActorRef
6+
import com.github.jw3.di.AnnotatedInjectionSpec.{AnnoBind, IBadActor, ISomeUnSomeAn, IUnannotatedActor}
7+
import com.github.jw3.di.test.InjectSpec
68
import com.google.inject.name.Names
7-
import com.rxthings.di.AnnotatedInjectionSpec.{IBadActor, _}
8-
import com.rxthings.di.test.{InjectSpec, NopActor}
9+
import com.github.jw3.di.AnnotatedInjectionSpec._
10+
import com.github.jw3.di.test.NopActor
911
import net.codingwell.scalaguice.ScalaModule
1012
import org.scalatest.Matchers
1113

src/test/scala/com/rxthings/di/ConfigModulesSpec.scala src/test/scala/com/github/jw3/di/ConfigModulesSpec.scala

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package com.rxthings.di
1+
package com.github.jw3.di
22

33
import java.util.UUID
44

5-
import com.rxthings.di.test.InjectSpec
5+
import com.github.jw3.di.test.InjectSpec
66
import net.codingwell.scalaguice.InjectorExtensions._
77
import net.codingwell.scalaguice.ScalaModule
88
import org.scalatest.Matchers
@@ -29,8 +29,8 @@ class ConfigModulesSpec extends InjectSpec with Matchers {
2929
}
3030

3131
object ConfigModulesSpec {
32-
val smod = "com.rxthings.di.StringM"
33-
val imod = "com.rxthings.di.IntM"
32+
val smod = "com.github.jw3.di.StringM"
33+
val imod = "com.github.jw3.di.IntM"
3434
val sval = UUID.randomUUID.toString
3535
val ival = Random.nextInt
3636
}

src/test/scala/com/rxthings/di/DefaultInjectionsSpec.scala src/test/scala/com/github/jw3/di/DefaultInjectionsSpec.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package com.rxthings.di
1+
package com.github.jw3.di
22

33
import akka.actor.ActorSystem
4-
import com.rxthings.di.test.InjectSpec
4+
import com.github.jw3.di.test.InjectSpec
55
import net.codingwell.scalaguice.InjectorExtensions._
66
import org.scalatest.Matchers
77

src/test/scala/com/rxthings/di/ExampleOfTestingSpec.scala src/test/scala/com/github/jw3/di/ExampleOfTestingSpec.scala

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
package com.rxthings.di
1+
package com.github.jw3.di
22

33
import akka.testkit.TestActorRef
4-
import com.rxthings.di.ExampleOfTestingSpec.M1
5-
import com.rxthings.di.test.{InjectSpec, NopActor}
4+
import com.github.jw3.di.test.InjectSpec
5+
import com.github.jw3.di.ExampleOfTestingSpec.M1
6+
import com.github.jw3.di.test.NopActor
67
import net.codingwell.scalaguice.ScalaModule
78
import org.scalatest.Matchers
89

src/test/scala/com/rxthings/di/ExtensionSpec.scala src/test/scala/com/github/jw3/di/ExtensionSpec.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.rxthings.di
1+
package com.github.jw3.di
22

3-
import com.rxthings.di.test.InjectSpec
3+
import com.github.jw3.di.test.InjectSpec
44
import com.typesafe.config.Config
55
import net.codingwell.scalaguice.KeyExtensions._
66
import net.codingwell.scalaguice._

src/test/scala/com/rxthings/di/InjectActorSpec.scala src/test/scala/com/github/jw3/di/InjectActorSpec.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package com.rxthings.di
1+
package com.github.jw3.di
22

33
import java.util.UUID
44

55
import akka.actor.ActorRef
66
import akka.testkit.TestActorRef
7-
import com.rxthings.di.test.{InjectSpec, NopActor}
7+
import com.github.jw3.di.test.{InjectSpec, NopActor}
88
import net.codingwell.scalaguice._
99
import org.scalatest.Matchers
1010

src/test/scala/com/rxthings/di/InjectOptionalSpec.scala src/test/scala/com/github/jw3/di/InjectOptionalSpec.scala

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package com.rxthings.di
1+
package com.github.jw3.di
22

33
import akka.actor.{Actor, ActorRef}
4-
import com.rxthings.di.InjectOptionalSpec.{BindsStuff, IDoExist, IDontExist}
5-
import com.rxthings.di.test.{InjectSpec, NopActor}
4+
import com.github.jw3.di.InjectOptionalSpec.{BindsStuff, IDoExist, IDontExist}
5+
import com.github.jw3.di.test.{InjectSpec, NopActor}
66
import net.codingwell.scalaguice.ScalaModule
77
import org.scalatest.Matchers
88

src/test/scala/com/rxthings/di/ManualModulesSpec.scala src/test/scala/com/github/jw3/di/ManualModulesSpec.scala

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package com.rxthings.di
1+
package com.github.jw3.di
22

33
import java.util.UUID
44

5-
import com.rxthings.di.ManualModulesSpec.{IntM, StringM}
6-
import com.rxthings.di.test.InjectSpec
5+
import com.github.jw3.di.ManualModulesSpec.{IntM, StringM}
6+
import com.github.jw3.di.test.InjectSpec
77
import net.codingwell.scalaguice.InjectorExtensions._
88
import net.codingwell.scalaguice.ScalaModule
99
import org.scalatest.Matchers

src/test/scala/com/rxthings/di/MemberInjectionSpec.scala src/test/scala/com/github/jw3/di/MemberInjectionSpec.scala

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
package com.rxthings.di
1+
package com.github.jw3.di
22

3+
import com.github.jw3.di.MemberInjectionSpec._
4+
import com.github.jw3.di.test.{BindingAnnotation1, BindingAnnotation2, InjectSpec}
35
import javax.inject.{Inject, Named}
4-
5-
import com.rxthings.di.MemberInjectionSpec.{M1, PropertyInjected, _}
6-
import com.rxthings.di.test.{BindingAnnotation1, BindingAnnotation2, InjectSpec}
76
import net.codingwell.scalaguice.ScalaModule
87
import org.scalatest.Matchers
98

src/test/scala/com/rxthings/di/NamedConfigSpec.scala src/test/scala/com/github/jw3/di/NamedConfigSpec.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.rxthings.di
1+
package com.github.jw3.di
22

33
import com.google.inject.Guice
44
import com.google.inject.name.Names

src/test/scala/com/rxthings/di/SimpleInjectionSpec.scala src/test/scala/com/github/jw3/di/SimpleInjectionSpec.scala

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package com.rxthings.di
1+
package com.github.jw3.di
22

33
import java.util.UUID
44

55
import akka.actor.Actor
6-
import com.rxthings.di.SimpleInjectectionSpec._
7-
import com.rxthings.di.test.InjectSpec
6+
import com.github.jw3.di.SimpleInjectectionSpec._
7+
import com.github.jw3.di.test.InjectSpec
88
import net.codingwell.scalaguice.ScalaModule
99
import org.scalatest.Matchers
1010

src/test/scala/com/rxthings/di/SpiSpec.scala src/test/scala/com/github/jw3/di/SpiSpec.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.rxthings.di
1+
package com.github.jw3.di
22

3-
import com.rxthings.di.test.{InjectSpec, SpiTests}
3+
import com.github.jw3.di.test.{InjectSpec, SpiTests}
44
import net.codingwell.scalaguice.InjectorExtensions._
55
import org.scalatest.Matchers
66

src/test/scala/com/rxthings/di/test/InjectSpec.scala src/test/scala/com/github/jw3/di/test/InjectSpec.scala

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package com.rxthings.di.test
1+
package com.github.jw3.di.test
22

33
import akka.actor.ActorSystem
44
import com.google.inject.{Injector, Module}
5-
import com.rxthings.di.InjectExt
6-
import com.rxthings.di.InjectExtBuilder._
5+
import com.github.jw3.di.InjectExt
6+
import com.github.jw3.di.InjectExtBuilder._
77
import com.typesafe.config.{Config, ConfigFactory, ConfigValueFactory}
88
import org.scalatest.WordSpecLike
99

src/test/scala/com/rxthings/di/test/NopActor.scala src/test/scala/com/github/jw3/di/test/NopActor.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.rxthings.di.test
1+
package com.github.jw3.di.test
22

33
import akka.actor.Actor
44

src/test/scala/com/rxthings/di/test/SpiTests.scala src/test/scala/com/github/jw3/di/test/SpiTests.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.rxthings.di.test
1+
package com.github.jw3.di.test
22

33
import java.util.UUID
44

0 commit comments

Comments
 (0)