From 9743b05a78ad2886784e0995a6cabd9b2cf49f8c Mon Sep 17 00:00:00 2001 From: "Alinson S. Xavier" Date: Mon, 21 Dec 2020 17:13:08 -0600 Subject: [PATCH] Move sync package to org.isoron.uhabits.core --- .../java/org/isoron/uhabits/sync/RemoteSyncServerTest.kt | 1 + .../src/main/java/org/isoron/uhabits/sync/RemoteSyncServer.kt | 1 + .../src/main/java/org/isoron/uhabits/sync/SyncManager.kt | 1 + .../org/isoron/uhabits/{ => core}/sync/AbstractSyncServer.kt | 2 +- .../java/org/isoron/uhabits/{ => core}/sync/EncryptionExt.kt | 2 +- .../main/java/org/isoron/uhabits/{ => core}/sync/SyncData.kt | 2 +- .../java/org/isoron/uhabits/{ => core}/sync/SyncException.kt | 2 +- .../org/isoron/uhabits/core/ui/screens/sync/SyncBehavior.kt | 2 +- .../test/java/org/isoron/uhabits/core/sync/EncryptionExtTest.kt | 1 - 9 files changed, 8 insertions(+), 6 deletions(-) rename android/uhabits-core/src/main/java/org/isoron/uhabits/{ => core}/sync/AbstractSyncServer.kt (98%) rename android/uhabits-core/src/main/java/org/isoron/uhabits/{ => core}/sync/EncryptionExt.kt (99%) rename android/uhabits-core/src/main/java/org/isoron/uhabits/{ => core}/sync/SyncData.kt (96%) rename android/uhabits-core/src/main/java/org/isoron/uhabits/{ => core}/sync/SyncException.kt (91%) diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/sync/RemoteSyncServerTest.kt b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/sync/RemoteSyncServerTest.kt index df2e13efa..69088ec1a 100644 --- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/sync/RemoteSyncServerTest.kt +++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/sync/RemoteSyncServerTest.kt @@ -28,6 +28,7 @@ import io.ktor.client.request.* import io.ktor.http.* import junit.framework.Assert.* import kotlinx.coroutines.* +import org.isoron.uhabits.core.sync.* import org.junit.* @MediumTest diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/sync/RemoteSyncServer.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/sync/RemoteSyncServer.kt index ed69b9108..cb74a447b 100644 --- a/android/uhabits-android/src/main/java/org/isoron/uhabits/sync/RemoteSyncServer.kt +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/sync/RemoteSyncServer.kt @@ -26,6 +26,7 @@ import io.ktor.client.features.* import io.ktor.client.features.json.* import io.ktor.client.request.* import kotlinx.coroutines.* +import org.isoron.uhabits.core.sync.* class RemoteSyncServer( private val baseURL: String, diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/sync/SyncManager.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/sync/SyncManager.kt index e3ada333a..9b3844c3f 100644 --- a/android/uhabits-android/src/main/java/org/isoron/uhabits/sync/SyncManager.kt +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/sync/SyncManager.kt @@ -27,6 +27,7 @@ import org.isoron.androidbase.* import org.isoron.uhabits.core.* import org.isoron.uhabits.core.commands.* import org.isoron.uhabits.core.preferences.* +import org.isoron.uhabits.core.sync.* import org.isoron.uhabits.core.tasks.* import org.isoron.uhabits.tasks.* import org.isoron.uhabits.utils.* diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/sync/AbstractSyncServer.kt b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/sync/AbstractSyncServer.kt similarity index 98% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/sync/AbstractSyncServer.kt rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/sync/AbstractSyncServer.kt index 070b13d0a..0209668ce 100644 --- a/android/uhabits-core/src/main/java/org/isoron/uhabits/sync/AbstractSyncServer.kt +++ b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/sync/AbstractSyncServer.kt @@ -17,7 +17,7 @@ * with this program. If not, see . */ -package org.isoron.uhabits.sync +package org.isoron.uhabits.core.sync interface AbstractSyncServer { /** diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/sync/EncryptionExt.kt b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/sync/EncryptionExt.kt similarity index 99% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/sync/EncryptionExt.kt rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/sync/EncryptionExt.kt index fea844d3c..c7857ac88 100644 --- a/android/uhabits-core/src/main/java/org/isoron/uhabits/sync/EncryptionExt.kt +++ b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/sync/EncryptionExt.kt @@ -19,7 +19,7 @@ @file:Suppress("UnstableApiUsage") -package org.isoron.uhabits.sync +package org.isoron.uhabits.core.sync import com.google.common.io.* import kotlinx.coroutines.* diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/sync/SyncData.kt b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/sync/SyncData.kt similarity index 96% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/sync/SyncData.kt rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/sync/SyncData.kt index 72960909b..f3359d2c8 100644 --- a/android/uhabits-core/src/main/java/org/isoron/uhabits/sync/SyncData.kt +++ b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/sync/SyncData.kt @@ -17,7 +17,7 @@ * with this program. If not, see . */ -package org.isoron.uhabits.sync +package org.isoron.uhabits.core.sync data class SyncData( val version: Long, diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/sync/SyncException.kt b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/sync/SyncException.kt similarity index 91% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/sync/SyncException.kt rename to android/uhabits-core/src/main/java/org/isoron/uhabits/core/sync/SyncException.kt index 5c5a81403..55e9c9a87 100644 --- a/android/uhabits-core/src/main/java/org/isoron/uhabits/sync/SyncException.kt +++ b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/sync/SyncException.kt @@ -17,7 +17,7 @@ * with this program. If not, see . */ -package org.isoron.uhabits.sync +package org.isoron.uhabits.core.sync open class SyncException: RuntimeException() diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/sync/SyncBehavior.kt b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/sync/SyncBehavior.kt index bb84b3bac..13783c057 100644 --- a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/sync/SyncBehavior.kt +++ b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/sync/SyncBehavior.kt @@ -20,7 +20,7 @@ package org.isoron.uhabits.core.ui.screens.sync import org.isoron.uhabits.core.preferences.* -import org.isoron.uhabits.sync.* +import org.isoron.uhabits.core.sync.* class SyncBehavior( val screen: Screen, diff --git a/android/uhabits-core/src/test/java/org/isoron/uhabits/core/sync/EncryptionExtTest.kt b/android/uhabits-core/src/test/java/org/isoron/uhabits/core/sync/EncryptionExtTest.kt index 0525f4363..040ec361f 100644 --- a/android/uhabits-core/src/test/java/org/isoron/uhabits/core/sync/EncryptionExtTest.kt +++ b/android/uhabits-core/src/test/java/org/isoron/uhabits/core/sync/EncryptionExtTest.kt @@ -20,7 +20,6 @@ package org.isoron.uhabits.core.sync import kotlinx.coroutines.* import org.hamcrest.Matchers.* -import org.isoron.uhabits.sync.* import org.junit.* import org.junit.Assert.* import java.io.*