From 250e35b726a43e71d0bc8165c75c36a17f361a9b Mon Sep 17 00:00:00 2001 From: Grisha Kruglov Date: Wed, 30 May 2018 13:38:45 -0700 Subject: [PATCH] Gradle support for publishing to bintray (#720) r=ncalexan * Rename SDK package name from com.mozilla.mentat to org.mozilla.mentat * Gradle configuration for publishing to a bintray repository --- sdks/android/Mentat/build.gradle | 9 ++++ sdks/android/Mentat/gradle.properties | 9 ++++ sdks/android/Mentat/library/build.gradle | 51 +++++++++++++++++++ .../mozilla/mentat/Expectation.java | 2 +- .../mozilla/mentat/FFIIntegrationTest.java | 2 +- .../library/src/main/AndroidManifest.xml | 2 +- .../mozilla/mentat/AttributeList.java | 2 +- .../mozilla/mentat/CacheDirection.java | 2 +- .../mozilla/mentat/ColResultIterator.java | 2 +- .../mozilla/mentat/CollResult.java | 2 +- .../mozilla/mentat/CollResultHandler.java | 2 +- .../mozilla/mentat/EntityBuilder.java | 4 +- .../mozilla/mentat/InProgress.java | 2 +- .../mozilla/mentat/InProgressBuilder.java | 2 +- .../mentat/InProgressTransactionResult.java | 2 +- .../java/{com => org}/mozilla/mentat/JNA.java | 2 +- .../{com => org}/mozilla/mentat/Mentat.java | 2 +- .../{com => org}/mozilla/mentat/Query.java | 4 +- .../mozilla/mentat/RelResult.java | 2 +- .../mozilla/mentat/RelResultHandler.java | 2 +- .../mozilla/mentat/RelResultIterator.java | 2 +- .../mozilla/mentat/RustObject.java | 2 +- .../mozilla/mentat/RustResult.java | 2 +- .../mozilla/mentat/ScalarResultHandler.java | 2 +- .../mozilla/mentat/TupleResult.java | 3 +- .../mozilla/mentat/TupleResultHandler.java | 2 +- .../{com => org}/mozilla/mentat/TxChange.java | 2 +- .../mozilla/mentat/TxChangeList.java | 2 +- .../mozilla/mentat/TxObserverCallback.java | 2 +- .../{com => org}/mozilla/mentat/TxReport.java | 2 +- .../mozilla/mentat/TypedValue.java | 3 +- 31 files changed, 97 insertions(+), 34 deletions(-) rename sdks/android/Mentat/library/src/androidTest/java/{com => org}/mozilla/mentat/Expectation.java (97%) rename sdks/android/Mentat/library/src/androidTest/java/{com => org}/mozilla/mentat/FFIIntegrationTest.java (99%) rename sdks/android/Mentat/library/src/main/java/{com => org}/mozilla/mentat/AttributeList.java (98%) rename sdks/android/Mentat/library/src/main/java/{com => org}/mozilla/mentat/CacheDirection.java (96%) rename sdks/android/Mentat/library/src/main/java/{com => org}/mozilla/mentat/ColResultIterator.java (98%) rename sdks/android/Mentat/library/src/main/java/{com => org}/mozilla/mentat/CollResult.java (98%) rename sdks/android/Mentat/library/src/main/java/{com => org}/mozilla/mentat/CollResultHandler.java (96%) rename sdks/android/Mentat/library/src/main/java/{com => org}/mozilla/mentat/EntityBuilder.java (99%) rename sdks/android/Mentat/library/src/main/java/{com => org}/mozilla/mentat/InProgress.java (99%) rename sdks/android/Mentat/library/src/main/java/{com => org}/mozilla/mentat/InProgressBuilder.java (99%) rename sdks/android/Mentat/library/src/main/java/{com => org}/mozilla/mentat/InProgressTransactionResult.java (98%) rename sdks/android/Mentat/library/src/main/java/{com => org}/mozilla/mentat/JNA.java (99%) rename sdks/android/Mentat/library/src/main/java/{com => org}/mozilla/mentat/Mentat.java (99%) rename sdks/android/Mentat/library/src/main/java/{com => org}/mozilla/mentat/Query.java (99%) rename sdks/android/Mentat/library/src/main/java/{com => org}/mozilla/mentat/RelResult.java (99%) rename sdks/android/Mentat/library/src/main/java/{com => org}/mozilla/mentat/RelResultHandler.java (96%) rename sdks/android/Mentat/library/src/main/java/{com => org}/mozilla/mentat/RelResultIterator.java (98%) rename sdks/android/Mentat/library/src/main/java/{com => org}/mozilla/mentat/RustObject.java (98%) rename sdks/android/Mentat/library/src/main/java/{com => org}/mozilla/mentat/RustResult.java (98%) rename sdks/android/Mentat/library/src/main/java/{com => org}/mozilla/mentat/ScalarResultHandler.java (96%) rename sdks/android/Mentat/library/src/main/java/{com => org}/mozilla/mentat/TupleResult.java (99%) rename sdks/android/Mentat/library/src/main/java/{com => org}/mozilla/mentat/TupleResultHandler.java (96%) rename sdks/android/Mentat/library/src/main/java/{com => org}/mozilla/mentat/TxChange.java (98%) rename sdks/android/Mentat/library/src/main/java/{com => org}/mozilla/mentat/TxChangeList.java (98%) rename sdks/android/Mentat/library/src/main/java/{com => org}/mozilla/mentat/TxObserverCallback.java (97%) rename sdks/android/Mentat/library/src/main/java/{com => org}/mozilla/mentat/TxReport.java (99%) rename sdks/android/Mentat/library/src/main/java/{com => org}/mozilla/mentat/TypedValue.java (98%) diff --git a/sdks/android/Mentat/build.gradle b/sdks/android/Mentat/build.gradle index 09f9f5ed..9f40753e 100644 --- a/sdks/android/Mentat/build.gradle +++ b/sdks/android/Mentat/build.gradle @@ -2,6 +2,11 @@ buildscript { ext.kotlin_version = '1.2.41' + + ext.library = [ + version: '0.3.1' + ] + repositories { jcenter() google() @@ -10,6 +15,10 @@ buildscript { classpath 'com.android.tools.build:gradle:3.1.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + // Publish. + classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3' + classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' + // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } diff --git a/sdks/android/Mentat/gradle.properties b/sdks/android/Mentat/gradle.properties index aac7c9b4..89e15d97 100644 --- a/sdks/android/Mentat/gradle.properties +++ b/sdks/android/Mentat/gradle.properties @@ -15,3 +15,12 @@ org.gradle.jvmargs=-Xmx1536m # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true + +libGroupId=org.mozilla.mentat +libRepositoryName=Mentat +libProjectName=mentat +libProjectDescription=A persistent, relational store inspired by Datomic and DataScript. +libUrl=https://github.com/mozilla/mentat +libVcsUrl=https://github.com/mozilla/mentat.git + +libLicense=MPL-2.0 diff --git a/sdks/android/Mentat/library/build.gradle b/sdks/android/Mentat/library/build.gradle index 1f8526c8..5facabdb 100644 --- a/sdks/android/Mentat/library/build.gradle +++ b/sdks/android/Mentat/library/build.gradle @@ -1,5 +1,8 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' +apply plugin: 'com.jfrog.bintray' +// Simply applying this plugin gets bintray to publish a pom file. +apply plugin: 'com.github.dcendents.android-maven' android { compileSdkVersion 27 @@ -46,3 +49,51 @@ dependencies { repositories { mavenCentral() } + +// Publishing to jcenter/bintray. +def libGroupId = properties.libGroupId +def libRepoName = properties.libRepositoryName +def libProjectName = properties.libProjectName +def libProjectDescription = properties.libProjectDescription +def libUrl = properties.libUrl +def libVcsUrl = properties.libVcsUrl +def libLicense = properties.libLicense + +Properties localProperties = null +if (project.rootProject.file('local.properties').canRead()) { + localProperties = new Properties() + localProperties.load(project.rootProject.file('local.properties').newDataInputStream()) +} + +version = rootProject.ext.library['version'] + +task sourcesJar(type: Jar) { + from android.sourceSets.main.java.srcDirs + classifier = 'sources' +} + +artifacts { + archives sourcesJar +} + + +group = libGroupId +archivesBaseName = libProjectName + +bintray { + user = localProperties != null ? localProperties.getProperty("bintray.user") : "" + key = localProperties != null ? localProperties.getProperty("bintray.apikey") : "" + + configurations = ['archives'] + pkg { + repo = libRepoName + name = libProjectName + userOrg = "grisha" // Temporary org name until package is on jcenter. Issue #725. + desc = libProjectDescription + websiteUrl = libUrl + vcsUrl = libVcsUrl + licenses = [libLicense] + publish = true + publicDownloadNumbers = true + } +} diff --git a/sdks/android/Mentat/library/src/androidTest/java/com/mozilla/mentat/Expectation.java b/sdks/android/Mentat/library/src/androidTest/java/org/mozilla/mentat/Expectation.java similarity index 97% rename from sdks/android/Mentat/library/src/androidTest/java/com/mozilla/mentat/Expectation.java rename to sdks/android/Mentat/library/src/androidTest/java/org/mozilla/mentat/Expectation.java index de8d5d73..3c99d674 100644 --- a/sdks/android/Mentat/library/src/androidTest/java/com/mozilla/mentat/Expectation.java +++ b/sdks/android/Mentat/library/src/androidTest/java/org/mozilla/mentat/Expectation.java @@ -8,7 +8,7 @@ * CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package com.mozilla.mentat; +package org.mozilla.mentat; import java.util.EventListener; diff --git a/sdks/android/Mentat/library/src/androidTest/java/com/mozilla/mentat/FFIIntegrationTest.java b/sdks/android/Mentat/library/src/androidTest/java/org/mozilla/mentat/FFIIntegrationTest.java similarity index 99% rename from sdks/android/Mentat/library/src/androidTest/java/com/mozilla/mentat/FFIIntegrationTest.java rename to sdks/android/Mentat/library/src/androidTest/java/org/mozilla/mentat/FFIIntegrationTest.java index 8b56c2ab..ebcc982a 100644 --- a/sdks/android/Mentat/library/src/androidTest/java/com/mozilla/mentat/FFIIntegrationTest.java +++ b/sdks/android/Mentat/library/src/androidTest/java/org/mozilla/mentat/FFIIntegrationTest.java @@ -8,7 +8,7 @@ * CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package com.mozilla.mentat; +package org.mozilla.mentat; import android.content.Context; import android.content.res.AssetManager; diff --git a/sdks/android/Mentat/library/src/main/AndroidManifest.xml b/sdks/android/Mentat/library/src/main/AndroidManifest.xml index a6c591ea..51e1ff81 100644 --- a/sdks/android/Mentat/library/src/main/AndroidManifest.xml +++ b/sdks/android/Mentat/library/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="org.mozilla.mentat"> \ No newline at end of file diff --git a/sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/AttributeList.java b/sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/AttributeList.java similarity index 98% rename from sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/AttributeList.java rename to sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/AttributeList.java index 76e7e593..5b3255a3 100644 --- a/sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/AttributeList.java +++ b/sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/AttributeList.java @@ -8,7 +8,7 @@ * CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package com.mozilla.mentat; +package org.mozilla.mentat; import com.sun.jna.Structure; import com.sun.jna.ptr.IntByReference; diff --git a/sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/CacheDirection.java b/sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/CacheDirection.java similarity index 96% rename from sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/CacheDirection.java rename to sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/CacheDirection.java index 56f1ff9e..0aedd548 100644 --- a/sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/CacheDirection.java +++ b/sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/CacheDirection.java @@ -8,7 +8,7 @@ * CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package com.mozilla.mentat; +package org.mozilla.mentat; public enum CacheDirection { FORWARD, REVERSE, BOTH diff --git a/sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/ColResultIterator.java b/sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/ColResultIterator.java similarity index 98% rename from sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/ColResultIterator.java rename to sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/ColResultIterator.java index d5ef1f59..2e2fd3df 100644 --- a/sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/ColResultIterator.java +++ b/sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/ColResultIterator.java @@ -8,7 +8,7 @@ * CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package com.mozilla.mentat; +package org.mozilla.mentat; import com.sun.jna.Pointer; diff --git a/sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/CollResult.java b/sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/CollResult.java similarity index 98% rename from sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/CollResult.java rename to sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/CollResult.java index 384eb6f3..8baf61ef 100644 --- a/sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/CollResult.java +++ b/sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/CollResult.java @@ -8,7 +8,7 @@ * CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package com.mozilla.mentat; +package org.mozilla.mentat; import com.sun.jna.Pointer; diff --git a/sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/CollResultHandler.java b/sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/CollResultHandler.java similarity index 96% rename from sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/CollResultHandler.java rename to sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/CollResultHandler.java index 9f6842e9..32c10d00 100644 --- a/sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/CollResultHandler.java +++ b/sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/CollResultHandler.java @@ -8,7 +8,7 @@ * CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package com.mozilla.mentat; +package org.mozilla.mentat; /** * Interface defining the structure of a callback from a query returning a {@link CollResult}. diff --git a/sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/EntityBuilder.java b/sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/EntityBuilder.java similarity index 99% rename from sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/EntityBuilder.java rename to sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/EntityBuilder.java index e2f067bd..56256a39 100644 --- a/sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/EntityBuilder.java +++ b/sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/EntityBuilder.java @@ -8,15 +8,13 @@ * CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package com.mozilla.mentat; +package org.mozilla.mentat; import android.util.Log; -import com.sun.jna.Memory; import com.sun.jna.Pointer; import java.io.IOException; -import java.nio.ByteBuffer; import java.util.Date; import java.util.UUID; diff --git a/sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/InProgress.java b/sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/InProgress.java similarity index 99% rename from sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/InProgress.java rename to sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/InProgress.java index 0af3fba8..6130706b 100644 --- a/sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/InProgress.java +++ b/sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/InProgress.java @@ -8,7 +8,7 @@ * CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package com.mozilla.mentat; +package org.mozilla.mentat; import android.util.Log; diff --git a/sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/InProgressBuilder.java b/sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/InProgressBuilder.java similarity index 99% rename from sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/InProgressBuilder.java rename to sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/InProgressBuilder.java index 81072fb2..f21e668c 100644 --- a/sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/InProgressBuilder.java +++ b/sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/InProgressBuilder.java @@ -8,7 +8,7 @@ * CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package com.mozilla.mentat; +package org.mozilla.mentat; import android.util.Log; diff --git a/sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/InProgressTransactionResult.java b/sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/InProgressTransactionResult.java similarity index 98% rename from sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/InProgressTransactionResult.java rename to sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/InProgressTransactionResult.java index b860d1e0..6148d16e 100644 --- a/sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/InProgressTransactionResult.java +++ b/sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/InProgressTransactionResult.java @@ -8,7 +8,7 @@ * CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package com.mozilla.mentat; +package org.mozilla.mentat; import android.util.Log; diff --git a/sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/JNA.java b/sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/JNA.java similarity index 99% rename from sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/JNA.java rename to sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/JNA.java index 2b6731bf..1b3b0023 100644 --- a/sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/JNA.java +++ b/sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/JNA.java @@ -8,7 +8,7 @@ * CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package com.mozilla.mentat; +package org.mozilla.mentat; import com.sun.jna.Library; import com.sun.jna.Native; diff --git a/sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/Mentat.java b/sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/Mentat.java similarity index 99% rename from sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/Mentat.java rename to sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/Mentat.java index 324ee4d6..84510440 100644 --- a/sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/Mentat.java +++ b/sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/Mentat.java @@ -8,7 +8,7 @@ * CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package com.mozilla.mentat; +package org.mozilla.mentat; import android.util.Log; diff --git a/sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/Query.java b/sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/Query.java similarity index 99% rename from sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/Query.java rename to sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/Query.java index f8ce2a98..db6d96c7 100644 --- a/sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/Query.java +++ b/sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/Query.java @@ -8,14 +8,12 @@ * CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package com.mozilla.mentat; +package org.mozilla.mentat; import android.util.Log; -import com.sun.jna.Memory; import com.sun.jna.Pointer; -import java.nio.ByteBuffer; import java.util.Date; import java.util.UUID; diff --git a/sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/RelResult.java b/sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/RelResult.java similarity index 99% rename from sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/RelResult.java rename to sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/RelResult.java index 0baab4a4..040d04e7 100644 --- a/sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/RelResult.java +++ b/sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/RelResult.java @@ -8,7 +8,7 @@ * CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package com.mozilla.mentat; +package org.mozilla.mentat; import com.sun.jna.Pointer; diff --git a/sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/RelResultHandler.java b/sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/RelResultHandler.java similarity index 96% rename from sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/RelResultHandler.java rename to sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/RelResultHandler.java index f9a4e39c..37f2c308 100644 --- a/sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/RelResultHandler.java +++ b/sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/RelResultHandler.java @@ -8,7 +8,7 @@ * CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package com.mozilla.mentat; +package org.mozilla.mentat; /** * Interface defining the structure of a callback from a query returning a {@link RelResult}. diff --git a/sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/RelResultIterator.java b/sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/RelResultIterator.java similarity index 98% rename from sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/RelResultIterator.java rename to sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/RelResultIterator.java index 28577a3f..2ba37694 100644 --- a/sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/RelResultIterator.java +++ b/sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/RelResultIterator.java @@ -8,7 +8,7 @@ * CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package com.mozilla.mentat; +package org.mozilla.mentat; import com.sun.jna.Pointer; diff --git a/sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/RustObject.java b/sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/RustObject.java similarity index 98% rename from sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/RustObject.java rename to sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/RustObject.java index e55c4e5f..bbc45bc0 100644 --- a/sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/RustObject.java +++ b/sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/RustObject.java @@ -8,7 +8,7 @@ * CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package com.mozilla.mentat; +package org.mozilla.mentat; import com.sun.jna.Memory; import com.sun.jna.Pointer; diff --git a/sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/RustResult.java b/sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/RustResult.java similarity index 98% rename from sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/RustResult.java rename to sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/RustResult.java index dc19ddc4..f2836bad 100644 --- a/sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/RustResult.java +++ b/sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/RustResult.java @@ -8,7 +8,7 @@ * CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package com.mozilla.mentat; +package org.mozilla.mentat; import com.sun.jna.Pointer; import com.sun.jna.Structure; diff --git a/sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/ScalarResultHandler.java b/sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/ScalarResultHandler.java similarity index 96% rename from sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/ScalarResultHandler.java rename to sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/ScalarResultHandler.java index ad4b2dd3..8219c181 100644 --- a/sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/ScalarResultHandler.java +++ b/sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/ScalarResultHandler.java @@ -8,7 +8,7 @@ * CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package com.mozilla.mentat; +package org.mozilla.mentat; /** * Interface defining the structure of a callback from a query returning a single {@link TypedValue}. diff --git a/sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/TupleResult.java b/sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/TupleResult.java similarity index 99% rename from sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/TupleResult.java rename to sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/TupleResult.java index d1b4c327..316d7fd8 100644 --- a/sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/TupleResult.java +++ b/sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/TupleResult.java @@ -8,11 +8,10 @@ * CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package com.mozilla.mentat; +package org.mozilla.mentat; import com.sun.jna.Pointer; -import java.nio.ByteBuffer; import java.util.Date; import java.util.UUID; diff --git a/sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/TupleResultHandler.java b/sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/TupleResultHandler.java similarity index 96% rename from sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/TupleResultHandler.java rename to sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/TupleResultHandler.java index 4eb7f766..c7272c0a 100644 --- a/sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/TupleResultHandler.java +++ b/sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/TupleResultHandler.java @@ -8,7 +8,7 @@ * CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package com.mozilla.mentat; +package org.mozilla.mentat; /** * Interface defining the structure of a callback from a query returning a {@link TupleResult}. diff --git a/sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/TxChange.java b/sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/TxChange.java similarity index 98% rename from sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/TxChange.java rename to sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/TxChange.java index d5b6a830..6b172bc0 100644 --- a/sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/TxChange.java +++ b/sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/TxChange.java @@ -8,7 +8,7 @@ * CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package com.mozilla.mentat; +package org.mozilla.mentat; import com.sun.jna.Pointer; import com.sun.jna.Structure; diff --git a/sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/TxChangeList.java b/sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/TxChangeList.java similarity index 98% rename from sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/TxChangeList.java rename to sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/TxChangeList.java index f27d163a..c90d3982 100644 --- a/sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/TxChangeList.java +++ b/sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/TxChangeList.java @@ -8,7 +8,7 @@ * CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package com.mozilla.mentat; +package org.mozilla.mentat; import com.sun.jna.Structure; diff --git a/sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/TxObserverCallback.java b/sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/TxObserverCallback.java similarity index 97% rename from sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/TxObserverCallback.java rename to sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/TxObserverCallback.java index 9b474954..c3464cd5 100644 --- a/sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/TxObserverCallback.java +++ b/sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/TxObserverCallback.java @@ -8,7 +8,7 @@ * CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package com.mozilla.mentat; +package org.mozilla.mentat; import com.sun.jna.Callback; diff --git a/sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/TxReport.java b/sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/TxReport.java similarity index 99% rename from sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/TxReport.java rename to sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/TxReport.java index abeaf530..2c82bb62 100644 --- a/sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/TxReport.java +++ b/sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/TxReport.java @@ -8,7 +8,7 @@ * CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package com.mozilla.mentat; +package org.mozilla.mentat; import com.sun.jna.Pointer; diff --git a/sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/TypedValue.java b/sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/TypedValue.java similarity index 98% rename from sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/TypedValue.java rename to sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/TypedValue.java index 3c89a5df..b73980bd 100644 --- a/sdks/android/Mentat/library/src/main/java/com/mozilla/mentat/TypedValue.java +++ b/sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/TypedValue.java @@ -8,11 +8,10 @@ * CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package com.mozilla.mentat; +package org.mozilla.mentat; import com.sun.jna.Pointer; -import java.nio.ByteBuffer; import java.util.Date; import java.util.UUID;