extracted android-json module

Miha-x64 · Jul 4, 2020 · e83d37e · e83d37e
1 parent 2dea9d9
commit e83d37e
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 33 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,8 +16,8 @@ before_install:
 #  - wget -O ~/codacy-coverage-reporter-assembly-latest.jar $(curl -s https://api.github.com/repos/codacy/codacy-coverage-reporter/releases/latest | jq -r '.assets[0].browser_download_url')
 
 script:
-  - ./gradlew clean :persistence:test :extended-persistence:test :properties:test :sql:test :http:test :fx-bindings:test :samples:fx-sample:test :android-bindings:test :samples:android-sample:test :samples:logic-sample:test
-#  - ./gradlew :persistence:bintrayUpload :extended-persistence:bintrayUpload :properties:bintrayUpload :android-bindings:bintrayUpload :sql:bintrayUpload :http:bintrayUpload
+  - ./gradlew clean :persistence:test :extended-persistence:test :properties:test :sql:test :http:test :fx-bindings:test :samples:fx-sample:test :android-json:test :android-bindings:test :samples:android-sample:test :samples:logic-sample:test
+#  - ./gradlew :persistence:bintrayUpload :extended-persistence:bintrayUpload :properties:bintrayUpload :android-json:bintrayUpload :android-bindings:bintrayUpload :sql:bintrayUpload :http:bintrayUpload
 
 #after_success:
 #  - java -jar ~/codacy-coverage-reporter-assembly-latest.jar report -l Java -r properties/build/reports/jacoco/test/jacocoTestReport.xml

diff --git a/README.md b/README.md
@@ -567,7 +567,8 @@ dependencies {
     implementation 'net.aquadc.properties:properties:0.0.14' // observables for both JVM and Android
     implementation 'net.aquadc.properties:persistence:0.0.14' // persistence for JVM and Android
     implementation 'net.aquadc.properties:extended-persistence:0.0.14' // partial structs, tuples, either, unsigned, primitive[], token transforms
-    implementation 'net.aquadc.properties:android-bindings:0.0.14' // AAR for Android(x): View bindings, Parcel, JsonReader as TokenStream, SharedPreferences as Struct, Handler as Executor
+    implementation 'net.aquadc.properties:android-bindings:0.0.14' // AAR for Android(x): View bindings, Parcel, SharedPreferences as Struct, Handler as Executor
+    implementation 'net.aquadc.properties:android-json:0.0.14' // AAR for Android(x): JsonReader as TokenStream
     implementation 'net.aquadc.properties:sql:0.0.14' // observable SQL and SQL templates
     implementation 'net.aquadc.properties:http:0.0.14' // RPC over HTTP: client-side HTTP templates, server-side routing, type-safe link generator
 }

diff --git a/android-bindings/build.gradle b/android-bindings/build.gradle
@@ -18,7 +18,6 @@ android {
     buildTypes {
         release {
             minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
 
@@ -53,6 +52,7 @@ dependencies {
     testImplementation project(':extended-persistence') // partial(Struct) is here
     testImplementation 'org.robolectric:robolectric:4.3.1'
     testImplementation project(path: ':sql', configuration: 'testOutput')
+    testImplementation project(':android-json')
 }
 
 apply from: rootProject.file('etc/release-bintray.gradle')
diff --git a/android-bindings/proguard-rules.pro b/android-bindings/proguard-rules.pro
diff --git a/android-json/.gitignore b/android-json/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/android-json/build.gradle b/android-json/build.gradle
@@ -0,0 +1,15 @@
+plugins {
+    id 'org.jetbrains.kotlin.jvm'
+}
+
+dependencies {
+    implementation "org.jetbrains.kotlin:kotlin-stdlib"
+    implementation "net.aquadc.collections:Collection-utils-jvm:1.0-$collection_utils_version"
+    implementation project(':persistence')
+    compileOnly "com.google.android:android:$android_artifact_version"
+
+    testImplementation 'junit:junit:4.12'
+    testImplementation project(':etc:testing')
+}
+
+apply from: rootProject.file('etc/release-bintray.gradle')
diff --git a/android-json/gradle.properties b/android-json/gradle.properties
@@ -0,0 +1,6 @@
+POM_NAME=Lychee Android JSON bindings
+POM_DESCRIPTION=JsonReader/JsonWriter bindings for Lychee persistence
+POM_BINTRAY_NAME=net.aquadc.lychee:android-json
+POM_ARTIFACT_ID=android-json
+POM_PACKAGING=jar
+POM_VERSION=0.0.14
diff --git a/...rsistence/android/json/JsonTokenStream.kt → ...rsistence/android/json/JsonTokenStream.kt b/...rsistence/android/json/JsonTokenStream.kt → ...rsistence/android/json/JsonTokenStream.kt
@@ -4,16 +4,13 @@ package net.aquadc.persistence.android.json
 import android.util.Base64
 import android.util.JsonReader
 import android.util.JsonToken
-import android.util.JsonWriter
 import net.aquadc.collections.contains
 import net.aquadc.collections.enumMapOf
 import net.aquadc.collections.get
 import net.aquadc.persistence.hasFraction
 import net.aquadc.persistence.tokens.Token
 import net.aquadc.persistence.tokens.TokenPath
 import net.aquadc.persistence.tokens.TokenStream
-import java.io.Reader
-import java.io.Writer
 
 
 @PublishedApi internal class JsonTokenStream(

diff --git a/...t/aquadc/persistence/android/json/json.kt → ...t/aquadc/persistence/android/json/json.kt b/...t/aquadc/persistence/android/json/json.kt → ...t/aquadc/persistence/android/json/json.kt
@@ -16,7 +16,6 @@ import net.aquadc.persistence.struct.Struct
 import net.aquadc.persistence.struct.forEach
 import net.aquadc.persistence.tokens.Token
 import net.aquadc.persistence.tokens.TokenStream
-import net.aquadc.persistence.tokens.readAs
 import net.aquadc.persistence.tokens.tokensFrom
 import net.aquadc.persistence.type.DataType
 import java.io.Reader

diff --git a/settings.gradle b/settings.gradle
@@ -15,3 +15,5 @@ include ':android-bindings'
 include ':samples:logic-sample'
 include ':samples:fx-sample'
 include ':samples:android-sample'
+include 'android-json'
+