Revert API-breaking change to CBLVersion (#1882)

* Revert API-breaking change to CBLVersion * Fix build errors
couchbase · Mar 15, 2019 · 5a7da40 · 5a7da40
1 parent e044bd5
commit 5a7da40
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 6 deletions.
diff --git a/android/CouchbaseLite/src/ce/java/com/couchbase/lite/ReplicatorConfiguration.java b/android/CouchbaseLite/src/ce/java/com/couchbase/lite/ReplicatorConfiguration.java
@@ -26,8 +26,6 @@
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
-import com.couchbase.lite.core.CBLVersion;
-
 
 /**
  * Replicator configuration.

diff --git a/...a/com/couchbase/lite/core/CBLVersion.java → ...n/java/com/couchbase/lite/CBLVersion.java b/...a/com/couchbase/lite/core/CBLVersion.java → ...n/java/com/couchbase/lite/CBLVersion.java
@@ -15,13 +15,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-package com.couchbase.lite.core;
+package com.couchbase.lite;
 
 import android.os.Build;
 
 import java.util.Locale;
 
-import com.couchbase.lite.BuildConfig;
 import com.couchbase.lite.internal.core.C4;
 
 

diff --git a/shared/src/main/java/com/couchbase/lite/AbstractDatabase.java b/shared/src/main/java/com/couchbase/lite/AbstractDatabase.java
@@ -40,7 +40,6 @@
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.json.JSONException;
 
-import com.couchbase.lite.core.CBLVersion;
 import com.couchbase.lite.internal.core.C4BlobStore;
 import com.couchbase.lite.internal.core.C4Constants;
 import com.couchbase.lite.internal.core.C4Constants.C4DatabaseFlags;

diff --git a/shared/src/main/java/com/couchbase/lite/FileLogger.java b/shared/src/main/java/com/couchbase/lite/FileLogger.java
@@ -25,7 +25,6 @@
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
-import com.couchbase.lite.core.CBLVersion;
 import com.couchbase.lite.internal.core.C4Constants;
 import com.couchbase.lite.internal.core.C4Log;
 import com.couchbase.lite.internal.support.Log;