From ffe0b9712c20dca9573c18b3583dfee3baf6cc65 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 9 Jul 2019 15:50:15 +0200
Subject: [PATCH] Convert file to Kotlin

---
 .../matrix/android/internal/di/MatrixScope.kt    | 15 +++++----------
 .../{SessionScope.java => SessionScope.kt}       | 15 +++++----------
 .../java/im/vector/riotx/core/di/ScreenScope.kt  | 16 +++++-----------
 3 files changed, 15 insertions(+), 31 deletions(-)
 rename vector/src/main/java/im/vector/riotx/core/di/ScreenScope.java => matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/MatrixScope.kt (69%)
 rename matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/{SessionScope.java => SessionScope.kt} (67%)
 rename matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/MatrixScope.java => vector/src/main/java/im/vector/riotx/core/di/ScreenScope.kt (65%)

diff --git a/vector/src/main/java/im/vector/riotx/core/di/ScreenScope.java b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/MatrixScope.kt
similarity index 69%
rename from vector/src/main/java/im/vector/riotx/core/di/ScreenScope.java
rename to matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/MatrixScope.kt
index a2243eabda..9c9327df55 100644
--- a/vector/src/main/java/im/vector/riotx/core/di/ScreenScope.java
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/MatrixScope.kt
@@ -14,16 +14,11 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.di;
+package im.vector.matrix.android.internal.di
 
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-import javax.inject.Scope;
+import javax.inject.Scope
 
 @Scope
-@Documented
-@Retention(RetentionPolicy.RUNTIME)
-public @interface ScreenScope {
-}
+@MustBeDocumented
+@Retention(AnnotationRetention.RUNTIME)
+annotation class MatrixScope
\ No newline at end of file
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/SessionScope.java b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/SessionScope.kt
similarity index 67%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/SessionScope.java
rename to matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/SessionScope.kt
index ffa26ea7a3..37753fdfcc 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/SessionScope.java
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/SessionScope.kt
@@ -14,16 +14,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session;
+package im.vector.matrix.android.internal.session
 
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-import javax.inject.Scope;
+import javax.inject.Scope
 
 @Scope
-@Documented
-@Retention(RetentionPolicy.RUNTIME)
-public @interface SessionScope {
-}
\ No newline at end of file
+@MustBeDocumented
+@Retention(AnnotationRetention.RUNTIME)
+annotation class SessionScope
\ No newline at end of file
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/MatrixScope.java b/vector/src/main/java/im/vector/riotx/core/di/ScreenScope.kt
similarity index 65%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/MatrixScope.java
rename to vector/src/main/java/im/vector/riotx/core/di/ScreenScope.kt
index d67465d5fc..27f39b1e73 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/MatrixScope.java
+++ b/vector/src/main/java/im/vector/riotx/core/di/ScreenScope.kt
@@ -14,17 +14,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.di;
+package im.vector.riotx.core.di
 
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
+import javax.inject.Scope
 
-import javax.inject.Scope;
-
-// TODO convert the 3 scope to Java?
 @Scope
-@Documented
-@Retention(RetentionPolicy.RUNTIME)
-public @interface MatrixScope {
-}
\ No newline at end of file
+@MustBeDocumented
+@Retention(AnnotationRetention.RUNTIME)
+annotation class ScreenScope