Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 5.3.8 #94

Merged
merged 1 commit into from
Aug 21, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 5 additions & 19 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,36 +9,22 @@ buildscript {
gradlePluginPortal()
}
dependencies {
classpath libs.gradle
classpath libs.kotlin.plugin
classpath libs.tools.gradle
classpath libs.kotlin.gradle
classpath libs.cpd
classpath libs.detekt.plugin
classpath libs.detekt.gradle
classpath libs.ktlint
classpath libs.dokka
classpath libs.protobuf.plugin
classpath libs.protobuf.gradle
}
}

allprojects {
repositories {
google()
mavenLocal()
mavenCentral()
}

def buildProperties = new Properties()
file(rootDir.absolutePath + "/build.properties").withInputStream { buildProperties.load(it) }
if (buildProperties.getProperty("build.debug").toBoolean()) {
configurations.all {
resolutionStrategy {
dependencySubstitution {
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')
}
}
}
}
}

subprojects {
Expand Down
2 changes: 0 additions & 2 deletions build.properties

This file was deleted.

4 changes: 2 additions & 2 deletions config.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ext {
]
releaseConfig = [
"group" : "com.infinum.dbinspector",
"version" : "5.3.7",
"versionCode": 5 * 100 * 100 + 3 * 100 + 7
"version" : "5.3.8",
"versionCode": 5 * 100 * 100 + 3 * 100 + 8
]
}
12 changes: 10 additions & 2 deletions deploy.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
task deployDbInspector(dependsOn: [
':dbinspector:clean',
':dbinspector:publishReleasePublicationToGithubRepository',
':dbinspector:publishReleasePublicationToSonatypeRepository'
]) {
group = "Deploy"
Expand All @@ -9,7 +8,6 @@ task deployDbInspector(dependsOn: [

task deployDbInspectorNoOp(dependsOn: [
':dbinspector-no-op:clean',
':dbinspector-no-op:publishReleasePublicationToGithubRepository',
':dbinspector-no-op:publishReleasePublicationToSonatypeRepository'
]) {
group = "Deploy"
Expand All @@ -23,3 +21,13 @@ task deployAll(dependsOn: [
group = "Deploy"
description = "Deploy all modules to repositories"
}

task deployDebug(dependsOn: [
':dbinspector:clean',
':dbinspector-no-op:clean',
':dbinspector:publishReleasePublicationToMavenLocal',
':dbinspector-no-op:publishReleasePublicationToMavenLocal'
]) {
group = "Deploy"
description = "Deploy all modules to local Maven repository"
}
26 changes: 13 additions & 13 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
[versions]
dbinspector = "5.3.7"
gradle = "4.2.2"
dbinspector = "5.3.8"
gradle = "7.0.1"
kotlin = "1.5.21"
coroutines = "1.5.1"
core = "1.6.0"
appcompat = "1.3.0"
activity = "1.2.3"
fragment = "1.3.5"
appcompat = "1.3.1"
activity = "1.3.0"
fragment = "1.3.6"
lifecycle = "2.3.1"
viewpager = "1.0.0"
paging = "3.0.0"
paging = "3.0.1"
recyclerview = "1.2.1"
startup = "1.0.0"
startup = "1.1.0"
swiperefresh = "1.1.0"
datastore = "1.0.0-rc01"
datastore = "1.0.0"
dynamicanimation = "1.0.0"
design = "1.4.0"
protobuf-core = "3.17.3"
Expand All @@ -22,7 +22,7 @@ koin = "3.1.2"
fuzzy = "1.3.1"
detekt = "1.17.1"
ktlintplugin = "10.1.0"
ktlint = "0.41.0"
ktlint = "0.42.1"
cpd = "3.1"
dokka = "1.5.0"
jacoco = "0.8.7"
Expand All @@ -35,9 +35,9 @@ mockitokotlin = "3.2.0"
library = { module = "com.infinum.dbinspector:dbinspector", version.ref = "dbinspector" }
librarynoop = { module = "com.infinum.dbinspector:dbinspector-no-op", version.ref = "dbinspector" }

gradle = { module = "com.android.tools.build:gradle", version.ref = "gradle" }
tools-gradle = { module = "com.android.tools.build:gradle", version.ref = "gradle" }

kotlin-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
kotlin-gradle = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
kotlin-core = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" }

coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }
Expand All @@ -60,15 +60,15 @@ material = { module = "com.google.android.material:material", version.ref = "des

protobuf-artifact = { module = "com.google.protobuf:protoc", version.ref = "protobuf-core" }
protobuf-javalite = { module = "com.google.protobuf:protobuf-javalite", version.ref = "protobuf-core" }
protobuf-plugin = { module = "com.google.protobuf:protobuf-gradle-plugin", version.ref = "protobuf-plugin" }
protobuf-gradle = { module = "com.google.protobuf:protobuf-gradle-plugin", version.ref = "protobuf-plugin" }

koin-android = { module = "io.insert-koin:koin-android", version.ref = "koin" }
koin-test = { module = "io.insert-koin:koin-test", version.ref = "koin" }
koin-junit5 = { module = "io.insert-koin:koin-test-junit5", version.ref = "koin" }

fuzzy = { module = "me.xdrop:fuzzywuzzy", version.ref = "fuzzy" }

detekt-plugin = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "detekt" }
detekt-gradle = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "detekt" }
detekt-formatting = { module = "io.gitlab.arturbosch.detekt:detekt-formatting", version.ref = "detekt" }

ktlint = { module = "org.jlleitschuh.gradle:ktlint-gradle", version.ref = "ktlintplugin" }
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists