Merge pull request #121 from infinum/release/6.0.0

Release 6.0.0

Author: KCeh

.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-09_
+
+* 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_

README.md

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

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"

buildSrc/src/main/groovy/com/infinum/maven/GithubConfiguration.groovy

@@ -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",

config.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 {

cpd.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 {
@@ -22,14 +22,6 @@ afterEvaluate {
                     password sonatype.password()
                 }
             }
-            maven {
-                name github.name()
-                url github.url()
-                credentials {
-                    username github.username()
-                    password github.password()
-                }
-            }
         }
         publications {
             release(MavenPublication) {
@@ -52,15 +44,15 @@ afterEvaluate {
                             url = "https://github.com/infinum/android_dbinspector/blob/master/LICENSE"
                         }
                     }
+                    organization {
+                        name = 'Infinum Inc.'
+                        url = 'https://infinum.com'
+                    }
                     developers {
                         developer {
-                            id = "reisub"
-                            name = "Dino Kovač"
-                        }
-                        developer {
-                            id = "knobtviker"
-                            name = "Bojan Komljenović"
-                            email = "[email protected]"
+                            id = 'Infinum'
+                            name = 'Infinum Inc.'
+                            url = 'https://infinum.com'
                         }
                     }
                     scm {

dbinspector-no-op/build.gradle

@@ -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()
+    }
+}