From 6be438283d3ff554b2e368fa380572fbc4755286 Mon Sep 17 00:00:00 2001 From: Travis Wyatt Date: Tue, 9 Mar 2021 11:54:57 -0800 Subject: [PATCH 1/2] Bump Kotlin, atomicfu and Gradle wrapper versions --- build.gradle.kts | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 2e804fb7..85920898 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -9,9 +9,9 @@ buildscript { } plugins { - kotlin("multiplatform") version "1.4.10" apply false + kotlin("multiplatform") version "1.4.31" apply false id("com.android.library") version "4.0.2" apply false - id("kotlinx-atomicfu") version "0.14.4" apply false + id("kotlinx-atomicfu") version "0.15.1" apply false id("org.jmailen.kotlinter") version "3.2.0" apply false id("binary-compatibility-validator") version "0.2.3" id("org.jetbrains.dokka") version "1.4.10.2" apply false diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 7c9c1583..91567e3b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ #Tue Jun 09 14:46:34 PDT 2020 -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStorePath=wrapper/dists From d0bbab86e88541b5dc6d568313d174d7d76aa477 Mon Sep 17 00:00:00 2001 From: Travis Wyatt Date: Tue, 9 Mar 2021 12:03:19 -0800 Subject: [PATCH 2/2] API Dump --- logging/api/logging.api | 4 ---- test/api/test.api | 6 +++--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/logging/api/logging.api b/logging/api/logging.api index f6a2f437..52152341 100644 --- a/logging/api/logging.api +++ b/logging/api/logging.api @@ -44,10 +44,6 @@ public final class com/juul/tuulbox/logging/Log { public static synthetic fun warn$default (Lcom/juul/tuulbox/logging/Log;Ljava/lang/Throwable;Ljava/lang/String;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V } -public synthetic class com/juul/tuulbox/logging/LogAtomicTagGeneratorRefVolatile { - public fun (Ljava/lang/Object;)V -} - public abstract interface class com/juul/tuulbox/logging/Logger { public abstract fun assert (Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V public abstract fun debug (Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V diff --git a/test/api/test.api b/test/api/test.api index 1d886892..c75789fd 100644 --- a/test/api/test.api +++ b/test/api/test.api @@ -8,9 +8,9 @@ public final class com/juul/tuulbox/test/AssertKt { public static final fun assertSimilar (FFF)V public static final fun assertSimilar (III)V public static final fun assertSimilar (JJJ)V - public static final fun assertSimilar-2yBKrUY (Lkotlinx/datetime/LocalDateTime;DLkotlinx/datetime/LocalDateTime;Lkotlinx/datetime/TimeZone;)V - public static synthetic fun assertSimilar-2yBKrUY$default (Lkotlinx/datetime/LocalDateTime;DLkotlinx/datetime/LocalDateTime;Lkotlinx/datetime/TimeZone;ILjava/lang/Object;)V - public static final fun assertSimilar-hN_NL7I (Lkotlinx/datetime/Instant;DLkotlinx/datetime/Instant;)V + public static final fun assertSimilar-8Mi8wO0 (Lkotlinx/datetime/Instant;DLkotlinx/datetime/Instant;)V + public static final fun assertSimilar-dWUq8MI (Lkotlinx/datetime/LocalDateTime;DLkotlinx/datetime/LocalDateTime;Lkotlinx/datetime/TimeZone;)V + public static synthetic fun assertSimilar-dWUq8MI$default (Lkotlinx/datetime/LocalDateTime;DLkotlinx/datetime/LocalDateTime;Lkotlinx/datetime/TimeZone;ILjava/lang/Object;)V } public final class com/juul/tuulbox/test/RunTestKt {