Merge pull request #1 from EndlessCodeGroup/feature/update-kotlin

Update Kotlin and Coroutines

Author: osipxd

buildSrc/src/main/kotlin/commons.gradle.kts

@@ -1,4 +1,5 @@
 import internal.java
+import internal.kotlin
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 // Java version
@@ -7,19 +8,23 @@ java {
     targetCompatibility = JavaVersion.VERSION_1_8
 }
 
+kotlin {
+    explicitApi()
+}
+
 repositories {
     jcenter()
 }
 
 dependencies {
     "implementation"(kotlin("stdlib-jdk8"))
-    "implementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.3")
+    "implementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2")
 }
 
 tasks.withType<KotlinCompile>().configureEach {
     kotlinOptions {
         jvmTarget = "1.8"
-        apiVersion = "1.3"
-        languageVersion = "1.3"
+        apiVersion = "1.4"
+        languageVersion = "1.4"
     }
 }

buildSrc/src/main/kotlin/dependencies.kt

@@ -4,7 +4,7 @@ const val sentry = "io.sentry:sentry:1.7.29"
 
 object fuel {
     private const val group = "com.github.kittinunf.fuel"
-    private const val version = "2.2.1"
+    private const val version = "2.3.1"
     const val self = "$group:fuel:$version"
     const val coroutines = "$group:fuel-coroutines:$version"
 }

buildSrc/src/main/kotlin/internal/accessors.kt

@@ -3,7 +3,12 @@ package internal
 import org.gradle.api.Project
 import org.gradle.api.plugins.JavaPluginExtension
 import org.gradle.kotlin.dsl.configure
+import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension
 
 internal fun Project.java(configure: JavaPluginExtension.() -> Unit) {
     extensions.configure(configure)
 }
+
+internal fun Project.kotlin(configure: KotlinProjectExtension.() -> Unit) {
+    extensions.configure(configure)
+}

inspector-api/src/main/kotlin/Annotations.kt

@@ -14,10 +14,10 @@ internal class Line(private val text: String) : Element {
 internal annotation class MarkdownMarker
 
 @MarkdownMarker
-abstract class Group(
+public abstract class Group internal constructor(
     private val indent: String,
     private val firstLine: String?,
-    private val lastLine: String? = firstLine
+    private val lastLine: String? = firstLine,
 ) : Element {
     private val children = arrayListOf<Element>()
 
@@ -35,11 +35,11 @@ abstract class Group(
         lastLine?.let { builder.append("$it\n") }
     }
 
-    operator fun String?.unaryPlus() {
+    public operator fun String?.unaryPlus() {
         children.add(Line(this ?: ""))
     }
 
-    operator fun List<String>?.unaryPlus() {
+    public operator fun List<String>?.unaryPlus() {
         this?.forEach { +it }
     }
 
@@ -50,27 +50,21 @@ abstract class Group(
     }
 }
 
-abstract class TextGroup : Group(indent = "", firstLine = null) {
+public abstract class TextGroup internal constructor() : Group(indent = "", firstLine = null) {
 
-    fun b(text: String): String {
-        return "**$text**"
-    }
+    public fun b(text: String): String = "**$text**"
 
-    fun it(text: String): String {
-        return "*$text*"
-    }
+    public fun it(text: String): String = "*$text*"
 
-    fun hr(): String {
-        return "---"
-    }
+    public fun hr(): String = "---"
 }
 
-class Markdown : TextGroup() {
-    fun code(lang: String = "", init: Code.() -> Unit) = initGroup(Code(lang), init)
+public class Markdown internal constructor() : TextGroup() {
+    public fun code(lang: String = "", init: Code.() -> Unit): Code = initGroup(Code(lang), init)
 }
 
-class Code(lang: String) : Group(indent = "", firstLine = "```$lang", lastLine = "```")
+public class Code internal constructor(lang: String) : Group(indent = "", firstLine = "```$lang", lastLine = "```")
 
-fun markdown(init: Markdown.() -> Unit): Markdown {
+public fun markdown(init: Markdown.() -> Unit): Markdown {
     return Markdown().also(init)
 }

inspector-api/src/main/kotlin/dsl/Markdown.kt

@@ -0,0 +1 @@
+package ru.endlesscode.inspector

inspector-api/src/main/kotlin/package.kt

@@ -9,7 +9,7 @@ import ru.endlesscode.inspector.util.similarTo
 /**
  * Reporter that filters if he already reported similar exception.
  */
-abstract class CachingReporter : Reporter {
+public abstract class CachingReporter : Reporter {
 
     private val reportedCauses = mutableListOf<Throwable>()
     private val handlers = CompoundReportHandler()
@@ -52,10 +52,10 @@ abstract class CachingReporter : Reporter {
      * @param onSuccess Will be called on successful report
      * @param onError Will be called on error during report
      */
-    abstract suspend fun report(
+    public abstract suspend fun report(
         title: String,
         exceptionData: ExceptionData,
         onSuccess: (String, ExceptionData) -> Unit,
-        onError: (Throwable) -> Unit
+        onError: (Throwable) -> Unit,
     )
 }

inspector-api/src/main/kotlin/report/CachingReporter.kt

@@ -3,7 +3,7 @@ package ru.endlesscode.inspector.report
 /**
  * Handler that dispatches events to many handlers.
  */
-class CompoundReportHandler : ReportHandler {
+public class CompoundReportHandler : ReportHandler {
 
     private val handlers = mutableListOf<ReportHandler>()
 
@@ -22,7 +22,7 @@ class CompoundReportHandler : ReportHandler {
     /**
      * Add given [handler] to list of handlers that should receive events.
      */
-    fun addHandler(handler: ReportHandler) {
+    public fun addHandler(handler: ReportHandler) {
         handlers.add(handler)
     }
 }

inspector-api/src/main/kotlin/report/CompoundReportHandler.kt

@@ -1,6 +1,6 @@
 package ru.endlesscode.inspector.report
 
-class ExceptionData(
-    val exception: Exception,
-    var times: Int = 1
+public class ExceptionData(
+    public val exception: Exception,
+    public var times: Int = 1,
 )

inspector-api/src/main/kotlin/report/ExceptionData.kt

@@ -1,9 +1,9 @@
 package ru.endlesscode.inspector.report
 
-interface ReportEnvironment {
+public interface ReportEnvironment {
 
-    companion object {
-        val EMPTY = object : ReportEnvironment {
+    public companion object {
+        public val EMPTY: ReportEnvironment = object : ReportEnvironment {
             override val appVersion: String = ""
             override val reporterId: String = ""
             override val fields: Map<String, ReportField> = emptyMap()
@@ -14,20 +14,20 @@ interface ReportEnvironment {
     /**
      * Version of app that uses Inspector.
      */
-    val appVersion: String
+    public val appVersion: String
 
     /**
      * Unique identifier of reporter.
      */
-    val reporterId: String
+    public val reporterId: String
 
     /**
      * Environment-related [fields][ReportField]. Stored as relation "name -> field".
      */
-    val fields: Map<String, ReportField>
+    public val fields: Map<String, ReportField>
 
     /**
      * Indicates that inspector enabled.
      */
-    val isInspectorEnabled: Boolean
+    public val isInspectorEnabled: Boolean
 }