Merge pull request #42 from infinum/feature/explicit-mode

Release of 1.2.2
infinum · Jan 29, 2021 · e52e77d · e52e77d
2 parents f0ce334 + 142ac76
commit e52e77d
Show file tree

Hide file tree

Showing 109 changed files with 1,795 additions and 1,530 deletions.
diff --git a/.gitignore b/.gitignore
@@ -20,3 +20,4 @@
 /ui-no-op/build/
 /lint/build/
 /.idea/codeStyles/
+/ui/jacoco.exec
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,19 @@
 Change Log
 ==========
 
+## Version 1.2.2
+
+_2021-01-29_
+
+* Update Gradle to 6.8.1.
+* Fix a crash bug when shadowing ViewModel clear() method.
+
+## Version 1.2.1
+
+_2021-01-18_
+
+* Enable Kotlin explicit mode.
+
 ## Version 1.2.0
 
 _2021-01-13_

diff --git a/README.md b/README.md
@@ -35,7 +35,7 @@ buildscript {
         maven { url "https://dl.bintray.com/infinum/android" }
     }
     dependencies {
-        classpath "co.infinum.collar:collar-plugin:1.2.0"
+        classpath "co.infinum.collar:collar-plugin:1.2.2"
     }
 }
 ```
@@ -48,7 +48,7 @@ buildscript {
         maven(url = "https://dl.bintray.com/infinum/android")
     }
     dependencies {
-        classpath("co.infinum.collar:collar-plugin:1.2.0")
+        classpath("co.infinum.collar:collar-plugin:1.2.2")
     }
 }
 ```
@@ -252,7 +252,7 @@ javaCompileOptions {
 ### Plugin extension
 ```gradle
 collar {
-    version "1.2.0"
+    version "1.2.2"
 }
 ```
 You can set a specific _Collar_ version to be used.
@@ -267,13 +267,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.2.0"
-releaseImplementation "co.infinum.collar:collar-ui-no-op:1.2.0"
+debugImplementation "co.infinum.collar:collar-ui:1.2.2"
+releaseImplementation "co.infinum.collar:collar-ui-no-op:1.2.2"
 ```
 **KotlinDSL**
 ```kotlin
-debugImplementation("co.infinum.collar:collar-ui:1.2.0")
-releaseImplementation("co.infinum.collar:collar-ui-no-op:1.2.0")
+debugImplementation("co.infinum.collar:collar-ui:1.2.2")
+releaseImplementation("co.infinum.collar:collar-ui-no-op:1.2.2")
 ```
 
 In order to start tracking with UI you must use _LiveCollector_ as in this example:
@@ -339,7 +339,7 @@ For example:
 
 ```
 collar {
-    version "1.2.0"
+    version "1.2.2"
     fileName = "example.json"
     packageName = "co.infinum.collar.sample.analytics.generated"
 }

diff --git a/annotations/bintray.gradle b/annotations/bintray.gradle
@@ -1,47 +1,51 @@
 apply plugin: 'maven-publish'
 apply plugin: "com.jfrog.bintray"
-apply plugin: 'com.github.dcendents.android-maven'
-
-group = collar.group
-version = collar.version
 
 task sourcesJar(type: Jar, dependsOn: assemble) {
     archiveClassifier.set('sources')
     from sourceSets.main.allSource
 }
 
-task javadocsJar(type: Jar, dependsOn: rootProject.dokka) {
-    archiveClassifier.set('javadoc')
-    from rootProject.dokka.outputDirectory
+task javadocsJar(type: Jar, dependsOn: "dokkaJavadoc") {
+    archiveClassifier.set("javadoc")
+    from dokkaJavadoc.outputDirectory
 }
 
-publishing {
-    publications {
-        infinum(MavenPublication) {
-            groupId = group
-            artifactId = 'collar-annotations'
+afterEvaluate {
+    publishing {
+        publications {
+            infinum(MavenPublication) {
+                from components.java
+
+                groupId = collar.group
+                artifactId = 'collar-annotations'
+                version = collar.version
+
+                artifact javadocsJar
+                artifact sourcesJar
 
-            artifact sourcesJar
-            artifact javadocsJar
-            pom {
-                name = 'Collar Annotations'
-                description = 'Gradle plugin which provides single point for analytics collection.'
-                url = 'https://github.com/infinum/android-collar'
-                licenses {
-                    license {
-                        name = 'The Apache License, Version 2.0'
-                        url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+                pom {
+                    name = "Collar Annotations"
+                    description = "Gradle plugin which provides single point for analytics collection."
+                    url = "https://github.com/infinum/android-collar"
+                    licenses {
+                        license {
+                            name = "Apache License 2.0"
+                            url = "https://github.com/infinum/android-collar/blob/master/LICENSE"
+                        }
+                    }
+                    developers {
+                        developer {
+                            id = "knobtviker"
+                            name = "Bojan Komljenović"
+                            email = "[email protected]"
+                        }
+                    }
+                    scm {
+                        connection = "https://github.com/infinum/android-collar.git"
+                        developerConnection = "https://github.com/infinum/android-collar.git"
+                        url = "https://github.com/infinum/android-collar"
                     }
-                }
-            }
-            pom.withXml {
-                def root = asNode()
-                def dependenciesNode = root.appendNode('dependencies')
-                configurations.implementation.allDependencies.each {
-                    def dependencyNode = dependenciesNode.appendNode('dependency')
-                    dependencyNode.appendNode('groupId', it.group)
-                    dependencyNode.appendNode('artifactId', it.name)
-                    dependencyNode.appendNode('version', it.version)
                 }
             }
         }
@@ -50,7 +54,7 @@ publishing {
 
 bintray {
     Properties properties = new Properties()
-    def bintrayProperties = rootProject.file('bintray.properties')
+    def bintrayProperties = rootProject.file("bintray.properties")
     if (bintrayProperties.exists()) {
         properties.load(new FileInputStream(bintrayProperties))
     } else {
@@ -61,15 +65,17 @@ bintray {
     user = properties.getProperty("bintray.user")
     key = properties.getProperty("bintray.apikey")
 
+    publications = ["infinum"]
+
     pkg {
-        repo = 'android'
-        name = 'collar-annotations'
-        userOrg = 'infinum'
-        desc = 'Collar Annotations package'
-        websiteUrl = 'https://github.com/infinum/android-collar'
-        issueTrackerUrl = 'https://github.com/infinum/android-collar/issues'
-        vcsUrl = 'https://github.com/infinum/android-collar.git'
-        licenses = ['Apache-2.0']
+        repo = "android"
+        name = "collar-annotations"
+        userOrg = "infinum"
+        desc = "Collar Annotations package"
+        websiteUrl = "https://github.com/infinum/android-collar"
+        issueTrackerUrl = "https://github.com/infinum/android-collar/issues"
+        vcsUrl = "https://github.com/infinum/android-collar.git"
+        licenses = ["Apache-2.0"]
         version {
             name = "${collar.version}"
             released = new Date()
@@ -79,41 +85,4 @@ bintray {
         override = true
         publicDownloadNumbers = true
     }
-
-    configurations = ['archives']
 }
-
-install {
-    repositories.mavenInstaller {
-        pom {
-            project {
-                packaging 'jar'
-                groupId 'co.infinum.collar'
-                artifactId 'collar-annotations'
-
-                name 'collar-annotations'
-                description 'Collar Annotations'
-                url 'https://github.com/infinum/android-collar'
-
-                licenses {
-                    license {
-                        name 'Apache'
-                        url 'https://github.com/infinum/android-collar/LICENSE'
-                    }
-                }
-                developers {
-                    developer {
-                        id 'knobtviker'
-                        name 'Bojan Komljenović'
-                        email '[email protected]'
-                    }
-                }
-                scm {
-                    connection 'https://github.com/infinum/android-collar.git'
-                    developerConnection 'https://github.com/infinum/android-collar.git'
-                    url 'https://github.com/infinum/android-collar'
-                }
-            }
-        }
-    }
-}
diff --git a/annotations/build.gradle b/annotations/build.gradle
@@ -1,6 +1,10 @@
 apply plugin: 'java-library'
 apply plugin: 'kotlin'
 
+kotlin {
+    explicitApi()
+}
+
 compileKotlin {
     kotlinOptions {
         jvmTarget = "1.8"

diff --git a/annotations/src/main/kotlin/co/infinum/collar/annotations/AnalyticsEvents.kt b/annotations/src/main/kotlin/co/infinum/collar/annotations/AnalyticsEvents.kt
@@ -5,4 +5,4 @@ package co.infinum.collar.annotations
  */
 @Target(AnnotationTarget.CLASS)
 @Retention(AnnotationRetention.RUNTIME)
-annotation class AnalyticsEvents
+public annotation class AnalyticsEvents
diff --git a/annotations/src/main/kotlin/co/infinum/collar/annotations/EventName.kt b/annotations/src/main/kotlin/co/infinum/collar/annotations/EventName.kt
@@ -9,7 +9,7 @@ package co.infinum.collar.annotations
  */
 @Target(AnnotationTarget.CLASS)
 @Retention(AnnotationRetention.RUNTIME)
-annotation class EventName(
+public annotation class EventName(
     val value: String = "",
     val enabled: Boolean = true
 )
diff --git a/annotations/src/main/kotlin/co/infinum/collar/annotations/EventParameterName.kt b/annotations/src/main/kotlin/co/infinum/collar/annotations/EventParameterName.kt
@@ -9,7 +9,7 @@ package co.infinum.collar.annotations
  */
 @Target(AnnotationTarget.FIELD)
 @Retention(AnnotationRetention.RUNTIME)
-annotation class EventParameterName(
+public annotation class EventParameterName(
     val value: String = "",
     val enabled: Boolean = true
 )
diff --git a/annotations/src/main/kotlin/co/infinum/collar/annotations/PropertyName.kt b/annotations/src/main/kotlin/co/infinum/collar/annotations/PropertyName.kt
@@ -9,7 +9,7 @@ package co.infinum.collar.annotations
  */
 @Target(AnnotationTarget.CLASS)
 @Retention(AnnotationRetention.RUNTIME)
-annotation class PropertyName(
+public annotation class PropertyName(
     val value: String = "",
     val enabled: Boolean = true
 )
diff --git a/annotations/src/main/kotlin/co/infinum/collar/annotations/ScreenName.kt b/annotations/src/main/kotlin/co/infinum/collar/annotations/ScreenName.kt
@@ -18,7 +18,7 @@ package co.infinum.collar.annotations
  */
 @Target(AnnotationTarget.CLASS)
 @Retention(AnnotationRetention.RUNTIME)
-annotation class ScreenName(
+public annotation class ScreenName(
     val value: String = "",
     val enabled: Boolean = true
 )
diff --git a/annotations/src/main/kotlin/co/infinum/collar/annotations/UserProperties.kt b/annotations/src/main/kotlin/co/infinum/collar/annotations/UserProperties.kt
@@ -5,4 +5,4 @@ package co.infinum.collar.annotations
  */
 @Target(AnnotationTarget.CLASS)
 @Retention(AnnotationRetention.RUNTIME)
-annotation class UserProperties
+public annotation class UserProperties
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         "compileSdk": 30,
         "targetSdk" : 30,
 
-        "buildTools": "30.0.2"
+        "buildTools": "30.0.3"
     ]
 
     apply from: "dependencies.gradle"
@@ -19,9 +19,9 @@ buildscript {
 
     dependencies {
         classpath packages.gradle
-        classpath packages.maven.plugin
         classpath packages.bintray
         classpath packages.kotlin.plugin
+        classpath packages.kotlin.serialization_plugin
         classpath packages.detekt.plugin
         classpath packages.dokka.plugin
     }
@@ -63,6 +63,7 @@ subprojects {
         maven { url "https://dl.bintray.com/infinum/android" }
     }
 
+    apply from: "../dokka.gradle"
     apply from: "../detekt.gradle"
 }
 
@@ -89,6 +90,4 @@ task detektAll(dependsOn: [
 
 apply from: "deploy.gradle"
 
-apply from: "dokka.gradle"
-
 apply from: "jacoco.gradle"