Release v0.7.0

.github/workflows/build.yml

@@ -16,4 +16,4 @@ jobs:
         with:
           java-version: 1.8
       - name: Perform base checks
-        run: ./gradlew demo:assembleDebug firestore:dokka
+        run: ./gradlew demo:assembleDebug publishToDirectory

CHANGELOG.md

@@ -0,0 +1,16 @@
+Starting from v0.7.0, you can [support development](https://github.com/sponsors/natario1) through the GitHub Sponsors program. 
+Companies can share a tiny part of their revenue and get private support hours in return. Thanks!
+
+## v0.7.0
+
+- New: Upgrade to Kotlin 1.4, Firestore 21.6.0 ([#12][12])
+- Breaking change: `FirestoreParcelers.add` is now `registerParceler` or `FirestoreParceler.register` ([#12][12])
+- Breaking change: `FirestoreDocument.CacheState` is now `FirestoreCacheState` ([#12][12])
+- Breaking change: parcelers moved to `com.otaliastudios.firestore.parcel.*` package ([#12][12])
+- Fix: do not crash exception when metadata is not present ([#12][12])
+
+<https://github.com/natario1/Egloo/compare/v0.6.0...v0.7.0>
+
+[natario1]: https://github.com/natario1
+
+[12]: https://github.com/natario1/Firestore/pull/12

README.md

@@ -11,8 +11,8 @@
 The lightweight, efficient wrapper for Firestore model data, written in Kotlin, with data-binding and Parcelable support.
 
 ```groovy
-implementation 'com.otaliastudios:firestore:0.6.0'
-kapt 'com.otaliastudios:firestore-compiler:0.6.0'
+implementation 'com.otaliastudios:firestore:0.7.0'
+kapt 'com.otaliastudios:firestore-compiler:0.7.0'
 ```
 
 - Efficient and lightweight
@@ -185,15 +185,15 @@ a parceler using `FirestoreDocument.registerParceler()`:
 class App : Application() {
 
     override fun onCreate() {
-        FirestoreDocument.registerParceler(GeoPoint::class, GeoPointParceler())
-        FirestoreDocument.registerParceler(Whatever::class, WhateverParceler())
+        registerParceler(GeoPointParceler)
+        registerParceler(WhateverParceler)
     }
 
-    class GeoPointParceler : FirestoreDocument.Parceler<GeoPoint>() {
+    object GeoPointParceler : FirestoreDocument.Parceler<GeoPoint>() {
         // ...
     }
 
-    class WhateverParceler : FirestoreDocument.Parceler<Whatever>() {
+    object WhateverParceler : FirestoreDocument.Parceler<Whatever>() {
         // ...
     }
 }

build.gradle.kts

@@ -5,15 +5,14 @@
 buildscript {
 
     extra["libDescription"] = "The efficient wrapper for Firestore model data."
-    extra["libVersion"] = "0.6.0"
+    extra["libVersion"] = "0.7.0"
     extra["libGroup"] = "com.otaliastudios"
     extra["githubUrl"] = "https://github.com/natario1/Firestore"
     extra["githubGit"] = "https://github.com/natario1/Firestore.git"
 
     extra["minSdkVersion"] = 16
     extra["compileSdkVersion"] = 29
     extra["targetSdkVersion"] = 29
-    extra["kotlinVersion"] = "1.3.61"
 
     repositories {
         google()
@@ -22,10 +21,9 @@ buildscript {
     }
 
     dependencies {
-        val kotlinVersion = property("kotlinVersion") as String
-        classpath("com.android.tools.build:gradle:3.6.1")
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
-        classpath("com.otaliastudios.tools:publisher:0.1.5")
+        classpath("com.android.tools.build:gradle:4.0.1")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.0")
+        classpath("com.otaliastudios.tools:publisher:0.3.3")
     }
 }
 

compiler/build.gradle.kts

@@ -2,12 +2,12 @@
  * Copyright (c) 2018 Otalia Studios. Author: Mattia Iavarone.
  */
 
-import com.otaliastudios.tools.publisher.PublisherExtension.License
-import com.otaliastudios.tools.publisher.PublisherExtension.Release
+import com.otaliastudios.tools.publisher.common.License
+import com.otaliastudios.tools.publisher.common.Release
 
 plugins {
     id("kotlin")
-    id("maven-publisher-bintray")
+    id("com.otaliastudios.tools.publisher")
 }
 
 java {
@@ -16,17 +16,12 @@ java {
 }
 
 dependencies {
-    val kotlinVersion = property("kotlinVersion") as String
-    api("org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion")
     api("com.squareup:kotlinpoet:1.5.0")
     api("com.squareup:kotlinpoet-metadata:1.5.0")
     api("com.squareup:kotlinpoet-metadata-specs:1.5.0")
 }
 
 publisher {
-    auth.user = "BINTRAY_USER"
-    auth.key = "BINTRAY_KEY"
-    auth.repo = "BINTRAY_REPO"
     project.artifact = "firestore-compiler"
     project.description = property("libDescription") as String
     project.group = property("libGroup") as String
@@ -36,4 +31,12 @@ publisher {
     release.version = property("libVersion") as String
     release.setSources(Release.SOURCES_AUTO)
     release.setDocs(Release.DOCS_AUTO)
+    bintray {
+        auth.user = "BINTRAY_USER"
+        auth.key = "BINTRAY_KEY"
+        auth.repo = "BINTRAY_REPO"
+    }
+    directory {
+        directory = "../build/maven"
+    }
 }

demo/build.gradle.kts

@@ -34,10 +34,7 @@ dependencies {
 
     implementation(project(":firestore"))
     kapt(project(":compiler"))
-
-    val kotlin = rootProject.extra["kotlinVersion"]
-    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin")
-    implementation("androidx.appcompat:appcompat:1.1.0")
-    implementation("androidx.core:core-ktx:1.2.0")
-    implementation("androidx.constraintlayout:constraintlayout:1.1.3")
+    implementation("androidx.appcompat:appcompat:1.2.0")
+    implementation("androidx.core:core-ktx:1.3.1")
+    implementation("androidx.constraintlayout:constraintlayout:2.0.1")
 }

firestore/build.gradle.kts

@@ -2,13 +2,13 @@
  * Copyright (c) 2018 Otalia Studios. Author: Mattia Iavarone.
  */
 
-import com.otaliastudios.tools.publisher.PublisherExtension.License
-import com.otaliastudios.tools.publisher.PublisherExtension.Release
+import com.otaliastudios.tools.publisher.common.License
+import com.otaliastudios.tools.publisher.common.Release
 
 plugins {
     id("com.android.library")
     id("kotlin-android")
-    id("maven-publisher-bintray")
+    id("com.otaliastudios.tools.publisher")
 }
 
 android {
@@ -19,11 +19,13 @@ android {
         versionName = property("libVersion") as String
     }
 
-    dataBinding.isEnabled = true
+    buildFeatures {
+        dataBinding = true
+    }
 
     sourceSets {
-        get("main").java.srcDirs("src/main/kotlin")
-        get("test").java.srcDirs("src/test/kotlin")
+        getByName("main").java.srcDirs("src/main/kotlin")
+        getByName("test").java.srcDirs("src/test/kotlin")
     }
 
     compileOptions {
@@ -32,21 +34,21 @@ android {
     }
 
     buildTypes {
-        get("release").consumerProguardFile("proguard-rules.pro")
+        getByName("release").consumerProguardFile("proguard-rules.pro")
+    }
+
+    kotlinOptions {
+        // Until the explicitApi() works in the Kotlin block...
+        // https://youtrack.jetbrains.com/issue/KT-37652
+        freeCompilerArgs += listOf("-Xexplicit-api=strict")
     }
 }
 
 dependencies {
-    val kotlinVersion = property("kotlinVersion")
-    api("org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion")
-    api("com.google.firebase:firebase-firestore:21.4.1")
-    api("com.jakewharton.timber:timber:4.7.1")
+    api("com.google.firebase:firebase-firestore-ktx:21.6.0")
 }
 
 publisher {
-    auth.user = "BINTRAY_USER"
-    auth.key = "BINTRAY_KEY"
-    auth.repo = "BINTRAY_REPO"
     project.artifact = "firestore"
     project.description = property("libDescription") as String
     project.group = property("libGroup") as String
@@ -55,4 +57,12 @@ publisher {
     project.addLicense(License.APACHE_2_0)
     release.setSources(Release.SOURCES_AUTO)
     release.setDocs(Release.DOCS_AUTO)
+    bintray {
+        auth.user = "BINTRAY_USER"
+        auth.key = "BINTRAY_KEY"
+        auth.repo = "BINTRAY_REPO"
+    }
+    directory {
+        directory = "../build/maven"
+    }
 }

firestore/src/main/kotlin/com/otaliastudios/firestore/FirestoreClass.kt

@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2018 Otalia Studios. Author: Mattia Iavarone.
+ */
+
+package com.otaliastudios.firestore
+
+import androidx.annotation.Keep
+
+/**
+ * Identifies [FirestoreDocument], [FirestoreMap]s and [FirestoreList]s
+ * so that they can be processed by the annotation processor.
+ */
+@Keep
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+public annotation class FirestoreClass
+// Keep in sync with compiler!