Merge pull request #35 from infinum/milestone/1.1.8

Milestone/1.1.8

CHANGELOG.md

@@ -1,6 +1,13 @@
 Change Log
 ==========
 
+## Version 1.1.8
+
+_2020-09-28_
+
+* Fix no op package.
+* Update Kotlin on 1.4.10
+
 ## Version 1.1.7
 
 _2020-09-09_

README.md

@@ -33,7 +33,7 @@ buildscript {
         maven { url "https://dl.bintray.com/infinum/android" }
     }
     dependencies {
-        classpath "co.infinum.collar:collar-plugin:1.1.7"
+        classpath "co.infinum.collar:collar-plugin:1.1.8"
     }
 }
 ```
@@ -46,7 +46,7 @@ buildscript {
         maven(url = "https://dl.bintray.com/infinum/android")
     }
     dependencies {
-        classpath("co.infinum.collar:collar-plugin:1.1.7")
+        classpath("co.infinum.collar:collar-plugin:1.1.8")
     }
 }
 ```
@@ -250,7 +250,7 @@ javaCompileOptions {
 ### Plugin extension
 ```gradle
 collar {
-    version "1.1.7"
+    version "1.1.8"
 }
 ```        
 You can set a specific _Collar_ version to be used.
@@ -265,13 +265,13 @@ You can search, filter and clear all sent analytics.
 In your app `build.gradle` or `build.gradle.kts` add:  
 **Groovy**
 ```gradle
-debugImplementation "co.infinum.collar:collar-ui:1.1.7"
-releaseImplementation "co.infinum.collar:collar-ui-no-op:1.1.7"
+debugImplementation "co.infinum.collar:collar-ui:1.1.8"
+releaseImplementation "co.infinum.collar:collar-ui-no-op:1.1.8"
 ```
 **KotlinDSL**
 ```kotlin
-debugImplementation("co.infinum.collar:collar-ui:1.1.7")
-releaseImplementation("co.infinum.collar:collar-ui-no-op:1.1.7")
+debugImplementation("co.infinum.collar:collar-ui:1.1.8")
+releaseImplementation("co.infinum.collar:collar-ui-no-op:1.1.8")
 ```
 
 In order to start tracking with UI you must use _LiveCollector_ as in this example:
@@ -329,7 +329,7 @@ For example:
 
 ```
 collar {
-    version "1.1.7"
+    version "1.1.8"
     fileName = "example.json"
     packageName = "co.infinum.collar.sample.analytics.generated"
 }

build.gradle

@@ -2,8 +2,8 @@ buildscript {
 
     ext.buildConfig = [
         "minSdk"    : 21,
-        "compileSdk": 29,
-        "targetSdk" : 29,
+        "compileSdk": 30,
+        "targetSdk" : 30,
 
         "buildTools": "30.0.2"
     ]

dependencies.gradle

@@ -1,16 +1,16 @@
 ext.collar = [
     "group"      : "co.infinum.collar",
-    "version"    : "1.1.7",
-    "versionCode": 1 * 100 * 100 + 1 * 100 + 7
+    "version"    : "1.1.8",
+    "versionCode": 1 * 100 * 100 + 1 * 100 + 8
 ]
 
 ext.versions = [
-    "collar"       : "1.1.7",
-    "gradle"       : "4.0.1",
-    "kotlin"       : "1.4.0",
-    "poet"         : "1.6.0",
-    "poet_metadata": "1.6.0",
-    "serialization": "1.0.0-RC",
+    "collar"       : "1.1.8",
+    "gradle"       : "4.1.0",
+    "kotlin"       : "1.4.10",
+    "poet"         : "1.7.2",
+    "poet_metadata": "1.7.2",
+    "serialization": "1.0.0",
     "annotations"  : "19.0.0",
     "incap"        : "0.2",
     "bintray"      : "1.8.5",
@@ -22,7 +22,7 @@ ext.versions = [
     "livedata"     : "2.2.0",
     "recyclerview" : "1.1.0",
     "room"         : "2.2.5",
-    "startup"      : "1.0.0-alpha03",
+    "startup"      : "1.0.0-beta01",
     "design"       : "1.2.1",
     "maven"        : "2.0",
     "detekt"       : "1.11.0",
@@ -38,7 +38,7 @@ ext.packages = [
         "poet"                : "com.squareup:kotlinpoet:${versions.poet}",
         "poet_metadata"       : "com.squareup:kotlinpoet-metadata:${versions.poet_metadata}",
         "serialization_plugin": "org.jetbrains.kotlin:kotlin-serialization:${versions.kotlin}",
-        "serialization_core"  : "org.jetbrains.kotlinx:kotlinx-serialization-core:${versions.serialization}"
+        "serialization_core"  : "org.jetbrains.kotlinx:kotlinx-serialization-json:${versions.serialization}"
     ],
     "annotations": "org.jetbrains:annotations-java5:${versions.annotations}",
     "incap"      : [

plugin/src/main/kotlin/co/infinum/collar/plugin/CollarExtension.kt

@@ -5,7 +5,7 @@ internal open class CollarExtension {
     companion object {
         const val NAME = "collar"
 
-        const val DEFAULT_VERSION = "1.1.7"
+        const val DEFAULT_VERSION = "1.1.8"
         private const val DEFAULT_FILENAME = ""
         private const val DEFAULT_PACKAGE_NAME = ""
     }

sample/build.gradle

@@ -23,8 +23,8 @@ android {
         applicationId "co.infinum.collar.sample"
         minSdkVersion buildConfig.minSdk
         targetSdkVersion buildConfig.targetSdk
-        versionCode 10107
-        versionName "1.1.7"
+        versionCode 10108
+        versionName "1.1.8"
 
         buildTypes {
             debug {
@@ -67,7 +67,7 @@ dependencies {
 }
 
 collar {
-    version "1.1.7"
+    version "1.1.8"
     fileName = "example.json"
     packageName = "co.infinum.collar.sample.analytics.trackingplan"
 }

ui-no-op/src/main/kotlin/co/infinum/collar/ui/Configuration.kt

@@ -0,0 +1,10 @@
+package co.infinum.collar.ui
+
+data class Configuration(
+
+    val showSystemNotifications: Boolean = false,
+
+    val showInAppNotifications: Boolean = false,
+
+    val redactedKeywords: Set<String> = setOf()
+)

ui-no-op/src/main/kotlin/co/infinum/collar/ui/LiveCollector.kt

@@ -15,8 +15,7 @@ import co.infinum.collar.Screen
  */
 @Suppress("UNUSED_PARAMETER")
 open class LiveCollector(
-    showSystemNotifications: Boolean = false,
-    showInAppNotifications: Boolean = false
+    private val configuration: Configuration = Configuration()
 ) : Collector {
 
     /**