Merge pull request #5 from EndlessCodeGroup/feature/java-interop

Better Java interop

Author: osipxd

CHANGELOG.md

@@ -1,8 +1,14 @@
 ## [Unreleased]
 
+### Changed
+
+- Better interoperability with Java
+
 ### Housekeeping
 
 - Migrate from jCenter to Maven Central
+- Update Gradle to 6.8.3
+- Update Sentry to 4.2.0
 
 ## [0.10.1]
 

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

@@ -27,5 +27,6 @@ tasks.withType<KotlinCompile>().configureEach {
         jvmTarget = "1.8"
         apiVersion = "1.4"
         languageVersion = "1.4"
+         freeCompilerArgs += "-Xjvm-default=enable"
     }
 }

buildSrc/src/main/kotlin/dependencies.kt

@@ -1,6 +1,6 @@
 @file:Suppress("ClassName")
 
-const val sentry = "io.sentry:sentry:4.0.0-beta.1"
+const val sentry = "io.sentry:sentry:4.2.0"
 
 object fuel {
     private const val group = "com.github.kittinunf.fuel"

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

@@ -3,6 +3,7 @@ package ru.endlesscode.inspector.report
 public interface ReportEnvironment {
 
     public companion object {
+        @JvmStatic
         public val EMPTY: ReportEnvironment = object : ReportEnvironment {
             override val appName: String = ""
             override val appVersion: String = ""

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

@@ -11,6 +11,7 @@ public interface ReportField {
     public val value: String
     public val show: Boolean
 
+    @JvmDefault
     public fun render(
         short: Boolean = true,
         separator: String = ": ",

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

@@ -14,6 +14,7 @@ public interface Reporter {
     /**
      * Alias for [addHandler] method.
      */
+    @JvmDefault
     public fun addHandler(
         beforeReport: (String, ExceptionData) -> Unit = { _, _ -> },
         onSuccess: (String, ExceptionData) -> Unit = { _, _ -> },
@@ -44,6 +45,7 @@ public interface Reporter {
     /**
      * Report about [exception] with the [message] that describes when exception thrown (asynchronously).
      */
+    @JvmDefault
     public fun report(message: String, exception: Exception) {
         report(message, exception, async = true)
     }
@@ -61,6 +63,7 @@ public interface Reporter {
      * @param message The message that will be used as title
      * @param block Block that should be executed
      */
+    @JvmDefault
     public fun track(message: String, block: () -> Unit) {
         try {
             block.invoke()

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

@@ -6,6 +6,7 @@ package ru.endlesscode.inspector.report
 public interface ReporterFocus {
 
     public companion object {
+        @JvmStatic
         public val NO_FOCUS: ReporterFocus = object : ReporterFocus {
             override val focusedPackage: String = ""
             override val environment: ReportEnvironment = ReportEnvironment.EMPTY

inspector-bukkit/build.gradle.kts

@@ -4,7 +4,7 @@ import ru.endlesscode.bukkitgradle.dependencies.spigotApi
 // Bukkit implementation build config
 
 plugins {
-    id("ru.endlesscode.bukkitgradle") version "0.9.1"
+    id("ru.endlesscode.bukkitgradle") version "0.9.2"
     publish
 }
 

inspector-bukkit/src/main/kotlin/report/BukkitEnvironment.kt

@@ -19,7 +19,6 @@ public class BukkitEnvironment internal constructor(
         public const val FIELD_INSPECTOR_VERSION: String = "Inspector version"
         public const val FIELD_REPORTER_ID: String = "Reporter ID"
 
-        @JvmStatic
         internal val DEFAULT_PROPERTIES = Properties()
     }
 
@@ -42,7 +41,7 @@ public class BukkitEnvironment internal constructor(
         ).showOnlyIf { inspector.shouldSendData(DataType.PLUGINS) },
 
         FIELD_INSPECTOR_VERSION to TextField(FIELD_INSPECTOR_VERSION, Inspector.version),
-        FIELD_REPORTER_ID to TextField(FIELD_REPORTER_ID, inspector.serverId.toString())
+        FIELD_REPORTER_ID to TextField(FIELD_REPORTER_ID, inspector.serverId.toString()),
     )
 
     override val isInspectorEnabled: Boolean

inspector-discord-reporter/http/hastebin.http

@@ -1,5 +1,5 @@
 POST https://hastebin.com/documents
-Content-type: text/plain
+Content-Type: text/plain
 
 Test content