Release 6.0.0

.github/workflows/CI.yml

@@ -56,47 +56,9 @@ jobs:
       - name: Stop Gradle
         run: ./gradlew --stop
 
-  ktlint:
-    name: ktlint
-    needs: [ validation ]
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v6
-      - name: Save Gradle Caches
-        uses: actions/cache@v4
-        with:
-          path: ~/.gradle/caches/
-          key: gradle-caches-${{ runner.os }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          restore-keys: |
-            gradle-caches-${{ runner.os }}-
-      - name: ktlint
-        run: ./gradlew ktlintAll
-      - name: Stop Gradle
-        run: ./gradlew --stop
-
-  cpd:
-    name: CPD
-    needs: [ validation ]
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v6
-      - name: Save Gradle Caches
-        uses: actions/cache@v4
-        with:
-          path: ~/.gradle/caches/
-          key: gradle-caches-${{ runner.os }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          restore-keys: |
-            gradle-caches-${{ runner.os }}-
-      - name: CPD
-        run: ./gradlew cpdAll
-      - name: Stop Gradle
-        run: ./gradlew --stop
-
   tests:
     name: Tests
-    needs: [ validation, lint, detekt, ktlint, cpd ]
+    needs: [ validation, lint, detekt ]
     runs-on: ubuntu-latest
     steps:
       - name: Checkout

CHANGELOG.md

@@ -1,6 +1,17 @@
 Changelog
 =========
 
+## Version 6.0.0
+
+_2026-02-10_
+
+* minSdk bumped to 24
+* Compile with SDK 36
+* Update Kotlin to 2.2.21.
+* Update dependencies to stable version.
+* Fix edge-to-edge
+* Fix edge case no-op DatabasesActivity crash
+
 ## Version 5.4.9
 
 _2022-10-21_

build.gradle

@@ -11,9 +11,7 @@ buildscript {
     dependencies {
         classpath libs.tools.gradle
         classpath libs.kotlin.gradle
-        classpath libs.cpd
         classpath libs.detekt.gradle
-        classpath libs.ktlint
         classpath libs.dokka
         classpath libs.protobuf.gradle
         classpath libs.kover
@@ -29,9 +27,7 @@ allprojects {
 }
 
 subprojects {
-    apply from: "$rootDir/cpd.gradle"
     apply from: "$rootDir/detekt.gradle"
-    apply from: "$rootDir/ktlint.gradle"
     apply from: "$rootDir/dokka.gradle"
 }
 
@@ -57,27 +53,9 @@ task detektAll(dependsOn: [
     description = "Run Detekt on all modules"
 }
 
-task ktlintAll(dependsOn: [
-        ':dbinspector:ktlintCheck',
-        ':dbinspector-no-op:ktlintCheck'
-]) {
-    group = "Verification"
-    description = "Run Ktlint on all modules"
-}
-
-task cpdAll(dependsOn: [
-        ':dbinspector:cpdCheck',
-        ':dbinspector-no-op:cpdCheck'
-]) {
-    group = "Verification"
-    description = "Run CPD on all modules"
-}
-
 task runStaticChecks(dependsOn: [
         ':lintAll',
-        ':detektAll',
-        ':ktlintAll',
-        ':cpdAll'
+        ':detektAll'
 ]) {
     group = "Verification"
     description = "Run static checks on all modules"

config.gradle

@@ -1,13 +1,13 @@
 ext {
-    def major = 5
-    def minor = 4
-    def patch = 9
+    def major = 6
+    def minor = 0
+    def patch = 0
 
     buildConfig = [
-            "minSdk"    : 21,
-            "compileSdk": 33,
-            "targetSdk" : 33,
-            "buildTools": "33.0.0"
+            "minSdk"    : 24,
+            "compileSdk": 36,
+            "targetSdk" : 36,
+            "buildTools": "35.0.0"
     ]
     releaseConfig = [
             "group"      : "com.infinum.dbinspector",

dbinspector-no-op/build.gradle

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     id "com.android.library"
     id "kotlin-android"
@@ -10,18 +12,15 @@ android {
     defaultConfig {
         minSdkVersion buildConfig.minSdk
         targetSdkVersion buildConfig.targetSdk
-        versionCode releaseConfig.versionCode
-        versionName releaseConfig.version
     }
 
     buildTypes {
         debug {
-            testCoverageEnabled true
-            debuggable true
             minifyEnabled false
+            enableUnitTestCoverage true
+            enableAndroidTestCoverage true
         }
         release {
-            debuggable false
             minifyEnabled true
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.txt"
         }
@@ -31,16 +30,19 @@ android {
     resourcePrefix "dbinspector_"
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
-        freeCompilerArgs += [
-                '-Xexplicit-api=strict',
-                '-Xjvm-default=all'
-        ]
+    kotlin {
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_17)
+            freeCompilerArgs.addAll([
+                    '-Xexplicit-api=strict',
+                    '-Xjvm-default=all',
+                    '-Xannotation-default-target=param-property'
+            ])
+        }
     }
 
     sourceSets.each {

dbinspector-no-op/publish.gradle

@@ -6,9 +6,9 @@ task sourcesJar(type: Jar) {
     from android.sourceSets.main.kotlin.srcDirs
 }
 
-task javadocsJar(type: Jar, dependsOn: "dokkaJavadoc") {
-    archiveClassifier.set("javadoc")
-    from dokkaJavadoc.outputDirectory
+task javadocsJar(type: Jar, dependsOn: "dokkaGenerate") {
+    getArchiveClassifier().set("javadoc")
+    from layout.buildDirectory.dir("javadoc")
 }
 
 afterEvaluate {

dbinspector-no-op/src/main/kotlin/com/infinum/dbinspector/ui/databases/DatabasesActivity.kt

@@ -1,5 +1,12 @@
 package com.infinum.dbinspector.ui.databases
 
 import android.app.Activity
+import android.os.Bundle
 
-internal class DatabasesActivity : Activity()
+internal class DatabasesActivity : Activity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        finish()
+    }
+}

dbinspector/build.gradle

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     id "com.android.library"
     id "kotlin-android"
@@ -13,18 +15,15 @@ android {
     defaultConfig {
         minSdkVersion buildConfig.minSdk
         targetSdkVersion buildConfig.targetSdk
-        versionCode releaseConfig.versionCode
-        versionName releaseConfig.version
     }
 
     buildTypes {
         debug {
-            testCoverageEnabled true
-            debuggable true
             minifyEnabled false
+            enableUnitTestCoverage true
+            enableAndroidTestCoverage true
         }
         release {
-            debuggable false
             minifyEnabled true
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.txt"
         }
@@ -38,22 +37,33 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
-        freeCompilerArgs += [
-                '-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi',
-                '-Xexplicit-api=strict',
-                '-Xjvm-default=all'
-        ]
+    kotlin {
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_17)
+            freeCompilerArgs.addAll([
+                    '-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi',
+                    '-Xexplicit-api=strict',
+                    '-Xjvm-default=all',
+                    '-Xannotation-default-target=param-property'
+            ])
+        }
     }
 
     testOptions {
         unitTests.returnDefaultValues = true
         unitTests.all {
+            testLogging {
+                events "passed", "skipped", "failed", "standardOut", "standardError"
+                exceptionFormat "full"
+                showExceptions true
+                showCauses true
+                showStackTraces true
+            }
+
             kover {
                 enabled = name == "testDebugUnitTest"
                 includes = [
@@ -91,6 +101,7 @@ android {
     }
 
     buildFeatures {
+        buildConfig = true
         viewBinding true
     }
 

dbinspector/publish.gradle

@@ -6,9 +6,9 @@ task sourcesJar(type: Jar) {
     from android.sourceSets.main.kotlin.srcDirs
 }
 
-task javadocsJar(type: Jar, dependsOn: "dokkaJavadoc") {
-    archiveClassifier.set("javadoc")
-    from dokkaJavadoc.outputDirectory
+task javadocsJar(type: Jar, dependsOn: "dokkaGenerate") {
+    getArchiveClassifier().set("javadoc")
+    from layout.buildDirectory.dir("javadoc")
 }
 
 afterEvaluate {

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

@@ -35,9 +35,7 @@ internal class Select {
     fun orderBy(sort: Sort, vararg columns: String?) {
         this.orderByDirection = sort
 
-        if (columns.isEmpty()) {
-            throw IllegalArgumentException("At least one column should be defined")
-        }
+        require(columns.isNotEmpty()) { "At least one column should be defined" }
         if (this.orderByColumns.isNotEmpty()) {
             error("Detected an attempt to re-define ORDER BY columns.")
         }

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

@@ -8,8 +8,8 @@ internal class Eq(
 ) : Condition() {
 
     init {
-        if (value != null && value !is Number && value !is String) {
-            throw IllegalArgumentException("Only null, number and string values can be used in the 'WHERE' clause")
+        require(value == null || value is Number || value is String) {
+            "Only null, number and string values can be used in the 'WHERE' clause"
         }
     }
 

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

@@ -8,10 +8,8 @@ internal class Like(
 ) : Condition() {
 
     init {
-        val isNotNumber = value !is Number
-        val isNotString = value !is String
-        if (isNotNumber && isNotString) {
-            throw IllegalArgumentException("Only number and string values can be used in the 'LIKE' condition")
+        require(value is Number || value is String) {
+            "Only number and string values can be used in the 'LIKE' condition"
         }
     }
 

dbinspector/src/main/kotlin/com/infinum/dbinspector/extensions/ByteArray.kt

@@ -26,7 +26,7 @@ internal fun ByteArray.toHexString(): String {
     return buffer.toString()
 }
 
-@Suppress("MagicNumber")
+@Suppress("MagicNumber", "UnusedPrivateProperty")
 internal fun ByteArray.toBase64String(): String {
     val table = (CharRange('A', 'Z') + CharRange('a', 'z') + CharRange('0', '9') + '+' + '/').toCharArray()
     val output = ByteArrayOutputStream()
@@ -36,14 +36,14 @@ internal fun ByteArray.toBase64String(): String {
         var b = this[position].toInt() and 0xFF shl 16 and 0xFFFFFF
         if (position + 1 < this.size) b = b or (this[position + 1].toInt() and 0xFF shl 8) else padding++
         if (position + 2 < this.size) b = b or (this[position + 2].toInt() and 0xFF) else padding++
-        (0 until 4 - padding).forEach { _ ->
+        for (i in 0 until 4 - padding) {
             val c = b and 0xFC0000 shr 18
             output.write(table[c].code)
             b = b shl 6
         }
         position += 3
     }
-    (0 until padding).forEach { _ ->
+    for (i in 0 until padding) {
         output.write('='.code)
     }
     return String(output.toByteArray())

dbinspector/src/main/kotlin/com/infinum/dbinspector/ui/Presentation.kt

@@ -22,7 +22,7 @@ import com.infinum.dbinspector.ui.schema.tables.TablesViewModel
 import com.infinum.dbinspector.ui.schema.triggers.TriggersViewModel
 import com.infinum.dbinspector.ui.schema.views.ViewsViewModel
 import com.infinum.dbinspector.ui.settings.SettingsViewModel
-import org.koin.androidx.viewmodel.dsl.viewModel
+import org.koin.core.module.dsl.viewModel
 import org.koin.core.module.Module
 import org.koin.dsl.module