Merge pull request #108 from infinum/develop

Develop

CHANGELOG.md

@@ -1,6 +1,13 @@
 Changelog
 =========
 
+## Version 5.4.8
+
+_2022-08-05_
+
+* Update Kotlin to 1.7.10.
+* Update dependencies to stable version.
+
 ## Version 5.4.7
 
 _2022-06-10_

README.md

@@ -44,13 +44,13 @@ Then add the following dependencies in your app `build.gradle` or `build.gradle.
 
 **Groovy**
 ```groovy
-debugImplementation "com.infinum.dbinspector:dbinspector:5.4.7"
-releaseImplementation "com.infinum.dbinspector:dbinspector-no-op:5.4.7"
+debugImplementation "com.infinum.dbinspector:dbinspector:5.4.8"
+releaseImplementation "com.infinum.dbinspector:dbinspector-no-op:5.4.8"
 ```
 **KotlinDSL**
 ```kotlin
-debugImplementation("com.infinum.dbinspector:dbinspector:5.4.7")
-releaseImplementation("com.infinum.dbinspector:dbinspector-no-op:5.4.7")
+debugImplementation("com.infinum.dbinspector:dbinspector:5.4.8")
+releaseImplementation("com.infinum.dbinspector:dbinspector-no-op:5.4.8")
 ```
 
 ### Usage

build.gradle

@@ -82,3 +82,9 @@ task runStaticChecks(dependsOn: [
     group = "Verification"
     description = "Run static checks on all modules"
 }
+
+task cleanMavenLocal {
+    doLast {
+        new File('~/.m2/repository/example').deleteDir()
+    }
+}

config.gradle

@@ -1,4 +1,8 @@
 ext {
+    def major = 5
+    def minor = 4
+    def patch = 8
+
     buildConfig = [
             "minSdk"    : 21,
             "compileSdk": 32,
@@ -7,7 +11,7 @@ ext {
     ]
     releaseConfig = [
             "group"      : "com.infinum.dbinspector",
-            "version"    : "5.4.7",
-            "versionCode": 5 * 100 * 100 + 4 * 100 + 7
+            "version"    : "$major.$minor.$patch",
+            "versionCode": major * 100 * 100 + minor * 100 + patch
     ]
 }

dbinspector-no-op/build.gradle

@@ -46,6 +46,13 @@ android {
     sourceSets.each {
         it.java.srcDirs += "src/$it.name/kotlin"
     }
+
+    publishing {
+        singleVariant('release') {
+            withSourcesJar()
+            withJavadocJar()
+        }
+    }
 }
 
 dependencies {

dbinspector/build.gradle

@@ -93,6 +93,13 @@ android {
     buildFeatures {
         viewBinding true
     }
+
+    publishing {
+        singleVariant('release') {
+            withSourcesJar()
+            withJavadocJar()
+        }
+    }
 }
 
 dependencies {

dbinspector/src/main/kotlin/com/infinum/dbinspector/domain/settings/interactors/RemoveIgnoredTableNameInteractor.kt

@@ -22,6 +22,6 @@ internal class RemoveIgnoredTableNameInteractor(
                         entity.toBuilder().removeIgnoredTableNames(indexed.first).build()
                     }
                 }
-        } ?: throw IllegalStateException("Ignored table name cannot be empty or blank.")
+        } ?: error("Ignored table name cannot be empty or blank.")
     }
 }

dbinspector/src/main/kotlin/com/infinum/dbinspector/domain/settings/interactors/SaveIgnoredTableNameInteractor.kt

@@ -21,6 +21,6 @@ internal class SaveIgnoredTableNameInteractor(
                     )
                     .build()
             }
-        } ?: throw IllegalStateException("Ignored table name cannot be empty or blank.")
+        } ?: error("Ignored table name cannot be empty or blank.")
     }
 }

dbinspector/src/main/kotlin/com/infinum/dbinspector/domain/shared/models/dsl/Delete.kt

@@ -22,7 +22,7 @@ internal class Delete {
 
     fun build(): String {
         if (!::table.isInitialized) {
-            throw IllegalStateException("Failed to build - target table is undefined")
+            error("Failed to build - target table is undefined")
         }
         return toString()
     }

dbinspector/src/main/kotlin/com/infinum/dbinspector/domain/shared/models/dsl/DropTrigger.kt

@@ -14,7 +14,7 @@ internal class DropTrigger {
 
     fun build(): String {
         if (!::trigger.isInitialized) {
-            throw IllegalStateException("Failed to build - target view is undefined")
+            error("Failed to build - target view is undefined")
         }
         return toString()
     }

dbinspector/src/main/kotlin/com/infinum/dbinspector/domain/shared/models/dsl/DropView.kt

@@ -14,7 +14,7 @@ internal class DropView {
 
     fun build(): String {
         if (!::view.isInitialized) {
-            throw IllegalStateException("Failed to build - target view is undefined")
+            error("Failed to build - target view is undefined")
         }
         return toString()
     }

dbinspector/src/main/kotlin/com/infinum/dbinspector/domain/shared/models/dsl/Pragma.kt

@@ -19,7 +19,7 @@ internal class Pragma {
 
     fun build(): String {
         if (!::pragmaName.isInitialized) {
-            throw IllegalStateException("Failed to build - pragmaName is undefined")
+            error("Failed to build - pragmaName is undefined")
         }
         return toString()
     }

dbinspector/src/main/kotlin/com/infinum/dbinspector/domain/shared/models/dsl/Select.kt

@@ -19,7 +19,7 @@ internal class Select {
 
     fun columns(vararg columns: String) {
         if (this.columns.isNotEmpty()) {
-            throw IllegalStateException("Detected an attempt to re-define columns to fetch.")
+            error("Detected an attempt to re-define columns to fetch.")
         }
         this.columns.addAll(columns)
     }
@@ -39,7 +39,7 @@ internal class Select {
             throw IllegalArgumentException("At least one column should be defined")
         }
         if (this.orderByColumns.isNotEmpty()) {
-            throw IllegalStateException("Detected an attempt to re-define ORDER BY columns.")
+            error("Detected an attempt to re-define ORDER BY columns.")
         }
         this.orderByColumns = columns.toList().filterNotNull()
     }
@@ -50,7 +50,7 @@ internal class Select {
 
     fun build(): String {
         if (!::table.isInitialized) {
-            throw IllegalStateException("Failed to build - target table is undefined")
+            error("Failed to build - target table is undefined")
         }
         return toString()
     }

dbinspector/src/main/kotlin/com/infinum/dbinspector/domain/shared/models/dsl/conditions/Eq.kt

@@ -14,7 +14,7 @@ internal class Eq(
     }
 
     override fun addCondition(condition: Condition) {
-        throw IllegalStateException("Can't add a nested condition to 'eq'")
+        error("Can't add a nested condition to 'eq'")
     }
 
     override fun toString(): String =

dbinspector/src/main/kotlin/com/infinum/dbinspector/domain/shared/models/dsl/conditions/Like.kt

@@ -16,7 +16,7 @@ internal class Like(
     }
 
     override fun addCondition(condition: Condition): Unit =
-        throw IllegalStateException("Can't add a nested condition to 'like'")
+        error("Can't add a nested condition to 'like'")
 
     override fun toString(): String =
         "$column LIKE \"%%$value%%\""

dbinspector/src/main/kotlin/com/infinum/dbinspector/ui/shared/delegates/LifecycleConnectionDelegate.kt

@@ -30,7 +30,7 @@ internal class LifecycleConnectionDelegate(
                         .currentState
                         .isAtLeast(Lifecycle.State.INITIALIZED).not()
                 ) {
-                    throw IllegalStateException("Owner has not passed created yet.")
+                    error("Owner has not passed created yet.")
                 }
 
                 val extras = when (thisRef) {

dbinspector/src/main/kotlin/com/infinum/dbinspector/ui/shared/delegates/ViewBindingDelegate.kt

@@ -48,7 +48,7 @@ internal class ViewBindingDelegate<T : ViewBinding>(
                         .currentState
                         .isAtLeast(Lifecycle.State.INITIALIZED).not()
                 ) {
-                    throw IllegalStateException("Fragment views are not created yet.")
+                    error("Fragment views are not created yet.")
                 }
 
                 viewBindingFactory(thisRef.requireView()).also { this.binding = it }

dbinspector/src/main/kotlin/com/infinum/dbinspector/ui/shared/views/SplitLinearLayout.kt

@@ -631,7 +631,7 @@ internal class SplitLinearLayout @JvmOverloads constructor(
 
     private fun checkChildCount() {
         if (childCount != 2) {
-            throw IllegalStateException("SplitLinearLayout must have exactly 2 child views.")
+            error("SplitLinearLayout must have exactly 2 child views.")
         }
     }
 

gradle/libs.versions.toml

@@ -1,13 +1,13 @@
 [versions]
-dbinspector = "5.4.7"
-gradle = "7.2.1"
-kotlin = "1.7.0"
-coroutines = "1.6.2"
+dbinspector = "5.4.8"
+gradle = "7.2.2"
+kotlin = "1.7.10"
+coroutines = "1.6.4"
 core = "1.8.0"
 appcompat = "1.4.2"
-activity = "1.4.0"
-fragment = "1.4.1"
-lifecycle = "2.4.1"
+activity = "1.5.1"
+fragment = "1.5.1"
+lifecycle = "2.5.1"
 viewpager = "1.0.0"
 paging = "3.1.1"
 recyclerview = "1.2.1"
@@ -16,14 +16,14 @@ swiperefresh = "1.1.0"
 datastore = "1.0.0"
 dynamicanimation = "1.0.0"
 design = "1.6.1"
-protobuf-core = "3.21.1"
-protobuf-plugin = "0.8.18"
+protobuf-core = "3.21.4"
+protobuf-plugin = "0.8.19"
 koin = "3.2.0"
-detekt = "1.20.0"
+detekt = "1.21.0"
 ktlintplugin = "10.3.0"
 ktlint = "0.45.2"
 cpd = "3.2"
-dokka = "1.6.21"
+dokka = "1.7.10"
 kover = "0.5.1"
 jacoco = "0.8.8"
 intellij = "1.0.647"

settings.gradle

@@ -2,6 +2,6 @@ enableFeaturePreview("VERSION_CATALOGS")
 
 rootProject.name="DbInspector"
 
-include "dbinspector"
-include "dbinspector-no-op"
+include ":dbinspector"
+include ":dbinspector-no-op"
 include ":sample"