Skip to content

Commit

Permalink
Merge pull request #73 from infinum/develop
Browse files Browse the repository at this point in the history 
Fix Timber planting multiple trees per Kotlin object instatiation
  • Loading branch information
@bojankoma
bojankoma authored Jan 22, 2021
2 parents 2d00a60 + 4a37fe3 commit 7318cbe
Show file tree
Hide file tree
Showing 4 changed files with 88 additions and 76 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
Changelog
=========

## Version 5.2.1

_2021-01-21_

* Fix Timber planting multiple trees.
* Update Gradle plugin to 4.1.2.
* Update dependencies.

## Version 5.2.0

_2021-01-11_
Expand Down
4 changes: 2 additions & 2 deletions dbinspector/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ dependencies {
implementation packages.androidx.paging
implementation packages.androidx.startup
implementation packages.androidx.swiperefreshlayout
implementation "androidx.datastore:datastore:1.0.0-alpha05"
implementation "com.google.protobuf:protobuf-javalite:3.10.0"
implementation packages.androidx.datastore
implementation packages.google.protobuf
implementation packages.google.design
implementation packages.kotlinx.coroutines
implementation packages.koin.android
Expand Down
18 changes: 9 additions & 9 deletions dbinspector/src/main/kotlin/com/infinum/dbinspector/DbInspector.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,22 @@ import timber.log.Timber.DebugTree

public object DbInspector {

private var loggerPlanted = false

@JvmStatic
public fun show() {

if (BuildConfig.DEBUG && !loggerPlanted) {
loggerPlanted = true
init {
if (BuildConfig.DEBUG) {
Timber.plant(DebugTree())
}
}

@JvmStatic
public fun show(): Unit =
with(Presentation.applicationContext()) {
this.startActivity(
Intent(this, DatabasesActivity::class.java).apply {
Intent(
this,
DatabasesActivity::class.java
).apply {
addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
}
)
}
}
}
134 changes: 69 additions & 65 deletions dependencies.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,74 +1,78 @@
ext.dbinspector = [
"group" : "com.infinum.dbinspector",
"version" : "5.2.0",
"versionCode": 5 * 100 * 100 + 2 * 100 + 0
"group" : "com.infinum.dbinspector",
"version" : "5.2.1",
"versionCode": 5 * 100 * 100 + 2 * 100 + 1
]

ext.versions = [
"dbinspector" : "5.2.0",
"gradle" : '4.1.1',
"kotlin" : "1.4.21",
"coroutines" : "1.4.2",
"bintray" : "1.8.5",
"core" : "1.3.2",
"appcompat" : "1.2.0",
"fragment" : "1.3.0-rc01",
"lifecycle" : "2.3.0-rc01",
"viewpager" : "1.0.0",
"paging" : "3.0.0-alpha11",
"recyclerview" : "1.2.0-beta01",
"startup" : "1.0.0",
"swiperefreshlayout": "1.1.0",
"design" : "1.2.1",
"koin" : "2.2.2",
"timber" : "4.7.1",
"detekt" : "1.15.0",
"dokka" : "1.4.20"
"dbinspector" : "5.2.0",
"gradle" : '4.1.2',
"kotlin" : "1.4.21",
"coroutines" : "1.4.2",
"bintray" : "1.8.5",
"core" : "1.3.2",
"appcompat" : "1.2.0",
"fragment" : "1.3.0-rc01",
"lifecycle" : "2.3.0-rc01",
"viewpager" : "1.0.0",
"paging" : "3.0.0-alpha12",
"recyclerview" : "1.2.0-beta01",
"startup" : "1.0.0",
"swiperefreshlayout": "1.1.0",
"datastore" : "1.0.0-alpha06",
"design" : "1.2.1",
"protobuf" : "3.10.0",
"koin" : "2.2.2",
"timber" : "4.7.1",
"detekt" : "1.15.0",
"dokka" : "1.4.20"
]

ext.packages = [
"gradle" : "com.android.tools.build:gradle:${versions.gradle}",
"kotlin" : [
"plugin": "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}",
"core" : "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${versions.kotlin}"
],
"kotlinx" : [
"coroutines": "org.jetbrains.kotlinx:kotlinx-coroutines-android:${versions.coroutines}"
],
"bintray" : "com.jfrog.bintray.gradle:gradle-bintray-plugin:${versions.bintray}",
"dbinspector": [
"dbinspector" : "com.infinum.sentinel:sentinel:${versions.sentinel}",
"dbinspector_no_op": "com.infinum.sentinel:sentinel-no-op:${versions.sentinel}"
],
"androidx" : [
"core" : "androidx.core:core-ktx:${versions.core}",
"appcompat" : "androidx.appcompat:appcompat:${versions.appcompat}",
"fragment" : "androidx.fragment:fragment-ktx:${versions.fragment}",
"lifecycle" : [
"common": "androidx.lifecycle:lifecycle-common-java8:${versions.lifecycle}"
"gradle" : "com.android.tools.build:gradle:${versions.gradle}",
"kotlin" : [
"plugin": "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}",
"core" : "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${versions.kotlin}"
],
"viewpager" : "androidx.viewpager2:viewpager2:${versions.viewpager}",
"recyclerview" : "androidx.recyclerview:recyclerview:${versions.recyclerview}",
"paging" : "androidx.paging:paging-runtime-ktx:${versions.paging}",
"swiperefreshlayout": "androidx.swiperefreshlayout:swiperefreshlayout:${versions.swiperefreshlayout}",
"startup" : "androidx.startup:startup-runtime:${versions.startup}"
],
"google" : [
"design": "com.google.android.material:material:${versions.design}"
],
"koin" : [
"android" : "org.koin:koin-android:${versions.koin}",
"scope" : "org.koin:koin-androidx-scope:${versions.koin}",
"viewmodel": "org.koin:koin-androidx-viewmodel:${versions.koin}"
],
"timber" : [
"core": "com.jakewharton.timber:timber:${versions.timber}"
],
"detekt" : [
"plugin" : "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:${versions.detekt}",
"formatting": "io.gitlab.arturbosch.detekt:detekt-formatting:${versions.detekt}"
],
"dokka" : [
"plugin": "org.jetbrains.dokka:dokka-gradle-plugin:${versions.dokka}"
]
"kotlinx" : [
"coroutines": "org.jetbrains.kotlinx:kotlinx-coroutines-android:${versions.coroutines}"
],
"bintray" : "com.jfrog.bintray.gradle:gradle-bintray-plugin:${versions.bintray}",
"dbinspector": [
"dbinspector" : "com.infinum.sentinel:sentinel:${versions.sentinel}",
"dbinspector_no_op": "com.infinum.sentinel:sentinel-no-op:${versions.sentinel}"
],
"androidx" : [
"core" : "androidx.core:core-ktx:${versions.core}",
"appcompat" : "androidx.appcompat:appcompat:${versions.appcompat}",
"fragment" : "androidx.fragment:fragment-ktx:${versions.fragment}",
"lifecycle" : [
"common": "androidx.lifecycle:lifecycle-common-java8:${versions.lifecycle}"
],
"viewpager" : "androidx.viewpager2:viewpager2:${versions.viewpager}",
"recyclerview" : "androidx.recyclerview:recyclerview:${versions.recyclerview}",
"paging" : "androidx.paging:paging-runtime-ktx:${versions.paging}",
"swiperefreshlayout": "androidx.swiperefreshlayout:swiperefreshlayout:${versions.swiperefreshlayout}",
"startup" : "androidx.startup:startup-runtime:${versions.startup}",
"datastore" : "androidx.datastore:datastore:${versions.datastore}"
],
"google" : [
"design" : "com.google.android.material:material:${versions.design}",
"protobuf": "com.google.protobuf:protobuf-javalite:${versions.protobuf}"
],
"koin" : [
"android" : "org.koin:koin-android:${versions.koin}",
"scope" : "org.koin:koin-androidx-scope:${versions.koin}",
"viewmodel": "org.koin:koin-androidx-viewmodel:${versions.koin}"
],
"timber" : [
"core": "com.jakewharton.timber:timber:${versions.timber}"
],
"detekt" : [
"plugin" : "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:${versions.detekt}",
"formatting": "io.gitlab.arturbosch.detekt:detekt-formatting:${versions.detekt}"
],
"dokka" : [
"plugin": "org.jetbrains.dokka:dokka-gradle-plugin:${versions.dokka}"
]
]

0 comments on commit 7318cbe

Please sign in to comment.