Merge pull request #86 from infinum/develop

Develop

CHANGELOG.md

@@ -1,6 +1,15 @@
 Changelog
 =========
 
+## Version 5.3.0
+
+_2021-04-10_
+
+* Update Gradle from 6.8.3 to 7.0.
+* Migrate from dependencies.gradle to version catalogs.
+* Update dependencies to more stable releases.
+* Remove Bintray deployment configuration.
+
 ## Version 5.2.9
 
 _2021-03-25_

README.md

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

build.gradle

@@ -2,21 +2,20 @@ buildscript {
 
     apply from: "config.gradle"
     apply from: "maven.gradle"
-    apply from: "dependencies.gradle"
 
     repositories {
         google()
         mavenCentral()
         gradlePluginPortal()
     }
     dependencies {
-        classpath packages.gradle
-        classpath packages.kotlin.plugin
-        classpath packages.cpd.plugin
-        classpath packages.detekt.plugin
-        classpath packages.ktlint.plugin
-        classpath packages.dokka.plugin
-        classpath packages.google.protobuf.plugin
+        classpath libs.gradle
+        classpath libs.kotlin.plugin
+        classpath libs.cpd
+        classpath libs.detekt.plugin
+        classpath libs.ktlint
+        classpath libs.dokka
+        classpath libs.protobuf.plugin
     }
 }
 
@@ -26,12 +25,7 @@ allprojects {
         mavenCentral()
         jcenter() {
             content {
-                includeModule("com.soywiz.korlibs.korte", "korte-jvm")
-                includeModule("org.jetbrains.trove4j", "trove4j")
                 includeModule("org.jetbrains.kotlinx", "kotlinx-html-jvm")
-                includeGroup("org.jetbrains.dokka")
-                includeGroup("org.jetbrains")
-                includeGroup("org.koin")
             }
         }
     }
@@ -42,8 +36,10 @@ allprojects {
         configurations.all {
             resolutionStrategy {
                 dependencySubstitution {
-                    substitute module(packages.dbinspector.dbinspector) with project(':dbinspector')
-                    substitute module(packages.dbinspector.dbinspector_no_op) with project(':dbinspector-no-op')
+                    def library = libs.library.get()
+                    def librarynoop = libs.librarynoop.get()
+                    substitute module(library.getModule().toString() + ":" + library.getVersionConstraint().toString()) with project(':dbinspector')
+                    substitute module(librarynoop.getModule().toString() + ":" + librarynoop.getVersionConstraint().toString()) with project(':dbinspector-no-op')
                 }
             }
         }

config.gradle

@@ -7,7 +7,7 @@ ext {
     ]
     releaseConfig = [
             "group"      : "com.infinum.dbinspector",
-            "version"    : "5.2.9",
-            "versionCode": 5 * 100 * 100 + 2 * 100 + 9
+            "version"    : "5.3.0",
+            "versionCode": 5 * 100 * 100 + 3 * 100 + 0
     ]
 }

dbinspector-no-op/build.gradle

@@ -48,7 +48,7 @@ android {
 }
 
 dependencies {
-    implementation packages.kotlin.core
+    implementation libs.kotlin.core
 }
 
 apply from: "publish.gradle"

dbinspector-no-op/publish.gradle

@@ -30,14 +30,6 @@ afterEvaluate {
                     password github.password()
                 }
             }
-            maven {
-                name bintray.name()
-                url bintray.url() + "/dbinspector-no-op/;publish=1;override=1"
-                credentials {
-                    username bintray.username()
-                    password bintray.password()
-                }
-            }
         }
         publications {
             release(MavenPublication) {

dbinspector/build.gradle

@@ -1,10 +1,9 @@
 plugins {
     id "com.android.library"
     id "kotlin-android"
+    id "com.google.protobuf"
 }
 
-apply from: "protobuf.gradle"
-
 android {
     compileSdkVersion buildConfig.compileSdk
     buildToolsVersion buildConfig.buildTools
@@ -50,6 +49,7 @@ android {
     }
 
     sourceSets.each {
+        it.proto.srcDirs += "src/$it.name/proto"
         it.java.srcDirs += "src/$it.name/kotlin"
     }
 
@@ -59,26 +59,31 @@ android {
 }
 
 dependencies {
-    implementation packages.kotlin.core
-    implementation packages.androidx.core
-    implementation packages.androidx.appcompat
-    implementation packages.androidx.activity
-    implementation packages.androidx.fragment
-    implementation packages.androidx.recyclerview
-    implementation packages.androidx.viewpager
-    implementation packages.androidx.paging
-    implementation packages.androidx.startup
-    implementation packages.androidx.swiperefreshlayout
-    implementation packages.androidx.datastore
-    implementation packages.androidx.dynamicanimation
-    implementation packages.google.protobuf.javalite
-    implementation packages.google.design
-    implementation packages.kotlinx.coroutines
-    implementation packages.koin.android
-    implementation packages.koin.scope
-    implementation packages.koin.viewmodel
-    implementation packages.timber.core
-    implementation packages.fuzzy.core
+    implementation libs.kotlin.core
+    implementation libs.coroutines
+    implementation libs.bundles.androidx
+    implementation libs.protobuf.javalite
+    implementation libs.material
+    implementation libs.koin
+    implementation libs.timber
+    implementation libs.fuzzy
+}
+
+protobuf {
+    protoc {
+        def protobufArtifact = libs.protobuf.artifact.get()
+        artifact = protobufArtifact.getModule().toString() + ":" + protobufArtifact.getVersionConstraint().toString()
+    }
+
+    generateProtoTasks {
+        all().each { task ->
+            task.builtins {
+                java {
+                    option "lite"
+                }
+            }
+        }
+    }
 }
 
 apply from: "publish.gradle"

dbinspector/proguard-rules.txt

@@ -11,4 +11,4 @@
 -keep class * extends com.google.protobuf.GeneratedMessageLite { *; }
 -keep public class com.infinum.dbinspector.data.models.local.proto.output.* {
   public protected *;
-}
+}

dbinspector/publish.gradle

@@ -30,14 +30,6 @@ afterEvaluate {
                     password github.password()
                 }
             }
-            maven {
-                name bintray.name()
-                url bintray.url() + "/dbinspector/;publish=1;override=1"
-                credentials {
-                    username bintray.username()
-                    password bintray.password()
-                }
-            }
         }
         publications {
             release(MavenPublication) {

deploy.gradle

@@ -1,6 +1,5 @@
 task deployDbInspector(dependsOn: [
         ':dbinspector:clean',
-        ':dbinspector:publishReleasePublicationToBintrayRepository',
         ':dbinspector:publishReleasePublicationToGithubRepository',
         ':dbinspector:publishReleasePublicationToSonatypeRepository'
 ]) {
@@ -10,7 +9,6 @@ task deployDbInspector(dependsOn: [
 
 task deployDbInspectorNoOp(dependsOn: [
         ':dbinspector-no-op:clean',
-        ':dbinspector-no-op:publishReleasePublicationToBintrayRepository',
         ':dbinspector-no-op:publishReleasePublicationToGithubRepository',
         ':dbinspector-no-op:publishReleasePublicationToSonatypeRepository'
 ]) {

detekt.gradle

@@ -1,9 +1,9 @@
 apply plugin: "io.gitlab.arturbosch.detekt"
 
 detekt {
-    toolVersion = versions.detekt
+    toolVersion = libs.versions.detekt.get()
 }
 
 dependencies {
-    detektPlugins packages.detekt.formatting
+    detektPlugins libs.detekt.formatting
 }