From 11913ab0fe84a447d44700c86338eb6a64da9654 Mon Sep 17 00:00:00 2001 From: Jaewoong Eum Date: Thu, 8 Dec 2022 09:01:23 +0900 Subject: [PATCH 1/6] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index df97622..b536e31 100644 --- a/README.md +++ b/README.md @@ -217,11 +217,11 @@ class App : Application() { override fun onCreate() { super.onCreate() - // change the log validator as your taste. - StreamLog.setValidator { priority, _ -> priority.level >= Priority.DEBUG.level } - // install AndroidStreamLogger. AndroidStreamLogger.installOnDebuggableApp(this) + + // change the log validator as your taste. + StreamLog.setValidator { priority, _ -> priority.level >= Priority.VERBOSE.level } } } ``` From a17bc5aeba0d9e31102384918a332b6e59066e79 Mon Sep 17 00:00:00 2001 From: Jaewoong Eum Date: Thu, 8 Dec 2022 09:02:03 +0900 Subject: [PATCH 2/6] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b536e31..c82be58 100644 --- a/README.md +++ b/README.md @@ -220,7 +220,7 @@ class App : Application() { // install AndroidStreamLogger. AndroidStreamLogger.installOnDebuggableApp(this) - // change the log validator as your taste. + // change the log validator as your taste. StreamLog.setValidator { priority, _ -> priority.level >= Priority.VERBOSE.level } } } From a682d8107751cf081b1a0b09545503f92efc1cf9 Mon Sep 17 00:00:00 2001 From: skydoves Date: Thu, 8 Dec 2022 09:08:54 +0900 Subject: [PATCH 3/6] Add minPriority parameter to the AndroidStreamLogger --- stream-log-android/api/stream-log-android.api | 8 +++--- .../log/android/AndroidStreamLogger.kt | 26 +++++++++---------- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/stream-log-android/api/stream-log-android.api b/stream-log-android/api/stream-log-android.api index 5af20bd..db54477 100644 --- a/stream-log-android/api/stream-log-android.api +++ b/stream-log-android/api/stream-log-android.api @@ -7,10 +7,10 @@ public final class io/getstream/log/android/AndroidStreamLogger : io/getstream/l } public final class io/getstream/log/android/AndroidStreamLogger$Companion { - public final fun install (I)V - public static synthetic fun install$default (Lio/getstream/log/android/AndroidStreamLogger$Companion;IILjava/lang/Object;)V - public final fun installOnDebuggableApp (Landroid/app/Application;I)V - public static synthetic fun installOnDebuggableApp$default (Lio/getstream/log/android/AndroidStreamLogger$Companion;Landroid/app/Application;IILjava/lang/Object;)V + public final fun install (Lio/getstream/log/Priority;I)V + public static synthetic fun install$default (Lio/getstream/log/android/AndroidStreamLogger$Companion;Lio/getstream/log/Priority;IILjava/lang/Object;)V + public final fun installOnDebuggableApp (Landroid/app/Application;Lio/getstream/log/Priority;I)V + public static synthetic fun installOnDebuggableApp$default (Lio/getstream/log/android/AndroidStreamLogger$Companion;Landroid/app/Application;Lio/getstream/log/Priority;IILjava/lang/Object;)V } public final class io/getstream/log/android/BuildConfig { diff --git a/stream-log-android/src/main/kotlin/io/getstream/log/android/AndroidStreamLogger.kt b/stream-log-android/src/main/kotlin/io/getstream/log/android/AndroidStreamLogger.kt index 6326495..febc850 100644 --- a/stream-log-android/src/main/kotlin/io/getstream/log/android/AndroidStreamLogger.kt +++ b/stream-log-android/src/main/kotlin/io/getstream/log/android/AndroidStreamLogger.kt @@ -76,31 +76,29 @@ public class AndroidStreamLogger constructor( * Install a new [AndroidStreamLogger] if the application is debuggable. * * @param application Application. + * @param minPriority The minimum [Priority] to show up log messages. * @param maxTagLength The maximum length size of the tag. */ - public fun installOnDebuggableApp(application: Application, maxTagLength: Int = DEFAULT_MAX_TAG_LENGTH) { + public fun installOnDebuggableApp( + application: Application, + minPriority: Priority = Priority.DEBUG, + maxTagLength: Int = DEFAULT_MAX_TAG_LENGTH, + ) { if (!StreamLog.isInstalled && application.isDebuggableApp) { - StreamLog.setValidator { priority, _ -> - priority.level >= Priority.DEBUG.level - } - StreamLog.install( - AndroidStreamLogger(maxTagLength = maxTagLength) - ) + StreamLog.setValidator { priority, _ -> priority.level >= minPriority.level } + StreamLog.install(AndroidStreamLogger(maxTagLength = maxTagLength)) } } /** * Install a new [AndroidStreamLogger]. * + * @param minPriority The minimum [Priority] to show up log messages. * @param maxTagLength The maximum length size of the tag. */ - public fun install(maxTagLength: Int = DEFAULT_MAX_TAG_LENGTH) { - StreamLog.setValidator { priority, _ -> - priority.level >= Priority.DEBUG.level - } - StreamLog.install( - AndroidStreamLogger(maxTagLength = maxTagLength) - ) + public fun install(minPriority: Priority = Priority.DEBUG, maxTagLength: Int = DEFAULT_MAX_TAG_LENGTH) { + StreamLog.setValidator { priority, _ -> priority.level >= minPriority.level } + StreamLog.install(AndroidStreamLogger(maxTagLength = maxTagLength)) } internal const val DEFAULT_MAX_TAG_LENGTH = 23 From 760e485d17ebfc1f132e863b55716a1ec84f42f9 Mon Sep 17 00:00:00 2001 From: skydoves Date: Thu, 8 Dec 2022 11:18:04 +0900 Subject: [PATCH 4/6] Refactor stream-log gradle file to KTS and change target module to jvm --- build.gradle | 10 +++++++++ stream-log-android-file/build.gradle | 9 -------- stream-log-android/build.gradle | 9 -------- stream-log-file/build.gradle | 11 +--------- stream-log/build.gradle | 33 ---------------------------- stream-log/build.gradle.kts | 19 ++++++++++++++++ 6 files changed, 30 insertions(+), 61 deletions(-) delete mode 100644 stream-log/build.gradle create mode 100644 stream-log/build.gradle.kts diff --git a/build.gradle b/build.gradle index fc0fb7e..93a8b00 100644 --- a/build.gradle +++ b/build.gradle @@ -36,6 +36,16 @@ subprojects { } if (it.name != 'app') { apply plugin: "io.gitlab.arturbosch.detekt" + + tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { + kotlinOptions.jvmTarget = 1.8 + kotlinOptions { + freeCompilerArgs += [ + '-progressive', + '-Xexplicit-api=strict', + ] + } + } } } diff --git a/stream-log-android-file/build.gradle b/stream-log-android-file/build.gradle index 0539f2f..5c1ab24 100644 --- a/stream-log-android-file/build.gradle +++ b/stream-log-android-file/build.gradle @@ -17,15 +17,6 @@ apply from: "${rootDir}/scripts/android.gradle" android { } -tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { - kotlinOptions { - freeCompilerArgs += [ - '-progressive', - '-Xexplicit-api=strict', - ] - } -} - dependencies { api project(":stream-log-android") implementation project(":stream-log-file") diff --git a/stream-log-android/build.gradle b/stream-log-android/build.gradle index e61b352..1c01394 100644 --- a/stream-log-android/build.gradle +++ b/stream-log-android/build.gradle @@ -17,15 +17,6 @@ apply from: "${rootDir}/scripts/android.gradle" android { } -tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { - kotlinOptions { - freeCompilerArgs += [ - '-progressive', - '-Xexplicit-api=strict', - ] - } -} - dependencies { api project(":stream-log") diff --git a/stream-log-file/build.gradle b/stream-log-file/build.gradle index 740bab0..ce567cc 100644 --- a/stream-log-file/build.gradle +++ b/stream-log-file/build.gradle @@ -14,18 +14,9 @@ ext { apply from: "${rootDir}/scripts/publish-module.gradle" -java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -} - tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { kotlinOptions { - freeCompilerArgs += [ - '-progressive', - '-Xexplicit-api=strict', - '-opt-in=kotlin.RequiresOptIn', - ] + freeCompilerArgs += ['-opt-in=kotlin.RequiresOptIn',] } } diff --git a/stream-log/build.gradle b/stream-log/build.gradle deleted file mode 100644 index 763c6ab..0000000 --- a/stream-log/build.gradle +++ /dev/null @@ -1,33 +0,0 @@ -import io.getstream.log.Configuration -import io.getstream.log.Dependencies - -plugins { - id 'java-library' - id 'kotlin' -} - -ext { - PUBLISH_GROUP_ID = Configuration.artifactGroup - PUBLISH_ARTIFACT_ID = 'stream-log' - PUBLISH_VERSION = rootVersionName -} - -apply from: "${rootDir}/scripts/publish-module.gradle" -java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -} - -tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { - kotlinOptions { - freeCompilerArgs += [ - '-progressive', - '-Xexplicit-api=strict', - ] - } -} - -dependencies { - testImplementation Dependencies.junit4 - detektPlugins(Dependencies.detektFormatting) -} diff --git a/stream-log/build.gradle.kts b/stream-log/build.gradle.kts new file mode 100644 index 0000000..f169c36 --- /dev/null +++ b/stream-log/build.gradle.kts @@ -0,0 +1,19 @@ +import io.getstream.log.Configuration +import io.getstream.log.Dependencies + +plugins { + kotlin("jvm") +} + +rootProject.extra.apply { + set("PUBLISH_GROUP_ID", Configuration.artifactGroup) + set("PUBLISH_ARTIFACT_ID", "stream-log") + set("PUBLISH_VERSION", rootProject.extra.get("rootVersionName")) +} + +apply(from = "$rootDir/scripts/publish-module.gradle") + +dependencies { + testImplementation(Dependencies.junit4) + detektPlugins(Dependencies.detektFormatting) +} From 240ad0c8d055f3b73dc7acec60188a292bc57ea5 Mon Sep 17 00:00:00 2001 From: skydoves Date: Thu, 8 Dec 2022 12:08:10 +0900 Subject: [PATCH 5/6] Migrate stream-log-file to jvm based module --- stream-log-file/build.gradle | 29 ----------------------------- stream-log-file/build.gradle.kts | 25 +++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 29 deletions(-) delete mode 100644 stream-log-file/build.gradle create mode 100644 stream-log-file/build.gradle.kts diff --git a/stream-log-file/build.gradle b/stream-log-file/build.gradle deleted file mode 100644 index ce567cc..0000000 --- a/stream-log-file/build.gradle +++ /dev/null @@ -1,29 +0,0 @@ -import io.getstream.log.Configuration -import io.getstream.log.Dependencies - -plugins { - id 'java-library' - id 'kotlin' -} - -ext { - PUBLISH_GROUP_ID = Configuration.artifactGroup - PUBLISH_ARTIFACT_ID = 'stream-log-file' - PUBLISH_VERSION = rootVersionName -} - -apply from: "${rootDir}/scripts/publish-module.gradle" - -tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { - kotlinOptions { - freeCompilerArgs += ['-opt-in=kotlin.RequiresOptIn',] - } -} - -dependencies { - api project(":stream-log") - - testImplementation Dependencies.junit4 - - detektPlugins(Dependencies.detektFormatting) -} diff --git a/stream-log-file/build.gradle.kts b/stream-log-file/build.gradle.kts new file mode 100644 index 0000000..90820d2 --- /dev/null +++ b/stream-log-file/build.gradle.kts @@ -0,0 +1,25 @@ +import io.getstream.log.Configuration +import io.getstream.log.Dependencies + +plugins { + kotlin("jvm") +} + +rootProject.extra.apply { + set("PUBLISH_GROUP_ID", Configuration.artifactGroup) + set("PUBLISH_ARTIFACT_ID", "stream-log-file") + set("PUBLISH_VERSION", rootProject.extra.get("rootVersionName")) +} + +apply(from = "$rootDir/scripts/publish-module.gradle") + +dependencies { + testImplementation(Dependencies.junit4) + detektPlugins(Dependencies.detektFormatting) +} + +dependencies { + api(project(":stream-log")) + testImplementation(Dependencies.junit4) + detektPlugins(Dependencies.detektFormatting) +} From f7fcabab410f19aceb7650a500716bf58b722b2d Mon Sep 17 00:00:00 2001 From: skydoves Date: Thu, 8 Dec 2022 12:16:56 +0900 Subject: [PATCH 6/6] Prepare for releasing v1.1.2 --- buildSrc/src/main/kotlin/io/getstream/log/Configuration.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/io/getstream/log/Configuration.kt b/buildSrc/src/main/kotlin/io/getstream/log/Configuration.kt index 00da848..11a4a24 100644 --- a/buildSrc/src/main/kotlin/io/getstream/log/Configuration.kt +++ b/buildSrc/src/main/kotlin/io/getstream/log/Configuration.kt @@ -7,7 +7,7 @@ object Configuration { const val minSdk = 21 const val majorVersion = 1 const val minorVersion = 1 - const val patchVersion = 1 + const val patchVersion = 2 const val versionName = "$majorVersion.$minorVersion.$patchVersion" const val snapshotVersionName = "$majorVersion.$minorVersion.${patchVersion + 1}-SNAPSHOT" const val artifactGroup = "io.getstream"