~review fixes

Kotlin · Feb 15, 2024 · a44eb4d · a44eb4d
1 parent 0076e99
commit a44eb4d
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 18 deletions.
diff --git a/docs/offline-instrumentation/index.md b/docs/offline-instrumentation/index.md
@@ -20,11 +20,11 @@ must be passed to Kover CLI as arguments, see [Kover CLI](../cli#offline-instrum
 #### Instrumentation by Kover Features
 Kover Features is a library that provides capabilities similar to Kover CLI and Kover Gradle plugin.
 
-You can declare a dependency on Kover Features using following coordinates: `org.jetbrains.kotlinx:kover-features-java:0.7.5`.
+You can declare a dependency on Kover Features using following coordinates: `org.jetbrains.kotlinx:kover-features-jvm:0.7.5`.
 
 Then you can use the Kover Features classes to instrument the bytecode of each class:
 ```kotlin
-import kotlinx.kover.features.java.KoverFeatures
+import kotlinx.kover.features.jvm.KoverFeatures
   // ...
 
   val instrumenter = KoverFeatures.createOfflineInstrumenter()

diff --git a/kover-cli/build.gradle.kts b/kover-cli/build.gradle.kts
@@ -33,7 +33,7 @@ kotlin {
 }
 
 dependencies {
-    implementation(project(":kover-features-java"))
+    implementation(project(":kover-features-jvm"))
 
     implementation(libs.args4j)
 

diff --git a/kover-cli/src/main/kotlin/kotlinx/kover/cli/commands/OfflineInstrumentCommand.kt b/kover-cli/src/main/kotlin/kotlinx/kover/cli/commands/OfflineInstrumentCommand.kt
@@ -17,7 +17,7 @@
 package kotlinx.kover.cli.commands
 
 import kotlinx.kover.cli.util.asRegex
-import kotlinx.kover.features.java.KoverLegacyFeatures
+import kotlinx.kover.features.jvm.KoverLegacyFeatures
 import org.kohsuke.args4j.Argument
 import org.kohsuke.args4j.Option
 import java.io.File

diff --git a/kover-cli/src/main/kotlin/kotlinx/kover/cli/commands/ReportCommand.kt b/kover-cli/src/main/kotlin/kotlinx/kover/cli/commands/ReportCommand.kt
@@ -86,15 +86,15 @@ internal class ReportCommand : Command {
         var fail = false
         if (xmlFile != null) {
             try {
-                KoverLegacyFeatures.xmlReport(xmlFile, binaryReports, outputRoots, sourceRoots, title ?: "Kover XML Report", filters)
+                KoverLegacyFeatures.generateXmlReport(xmlFile, binaryReports, outputRoots, sourceRoots, title ?: "Kover XML Report", filters)
             } catch (e: IOException) {
                 fail = true
                 errorWriter.println("XML generation failed: " + e.message)
             }
         }
         if (htmlDir != null) {
             try {
-                KoverLegacyFeatures.htmlReport(htmlDir, binaryReports, outputRoots, sourceRoots, title ?: "Kover HTML Report", filters)
+                KoverLegacyFeatures.generateHtmlReport(htmlDir, binaryReports, outputRoots, sourceRoots, title ?: "Kover HTML Report", filters)
             } catch (e: IOException) {
                 fail = true
                 errorWriter.println("HTML generation failed: " + e.message)

diff --git a/kover-features-java/build.gradle.kts → kover-features-jvm/build.gradle.kts b/kover-features-java/build.gradle.kts → kover-features-jvm/build.gradle.kts
diff --git a/...nx/kover/features/java/ConDySettings.java → ...inx/kover/features/jvm/ConDySettings.java b/...nx/kover/features/java/ConDySettings.java → ...inx/kover/features/jvm/ConDySettings.java
@@ -1,4 +1,4 @@
-package kotlinx.kover.features.java;
+package kotlinx.kover.features.jvm;
 
 /**
  * Internal class to control JVM ConDy settings.

diff --git a/...nx/kover/features/java/KoverFeatures.java → ...inx/kover/features/jvm/KoverFeatures.java b/...nx/kover/features/java/KoverFeatures.java → ...inx/kover/features/jvm/KoverFeatures.java
@@ -1,4 +1,4 @@
-package kotlinx.kover.features.java;
+package kotlinx.kover.features.jvm;
 
 import java.io.InputStream;
 import java.util.Scanner;

diff --git a/...er/features/java/KoverLegacyFeatures.java → ...ver/features/jvm/KoverLegacyFeatures.java b/...er/features/java/KoverLegacyFeatures.java → ...ver/features/jvm/KoverLegacyFeatures.java
@@ -1,4 +1,4 @@
-package kotlinx.kover.features.java;
+package kotlinx.kover.features.jvm;
 
 import com.intellij.rt.coverage.instrument.api.OfflineInstrumentationApi;
 import com.intellij.rt.coverage.report.api.Filters;
@@ -34,11 +34,11 @@ public static void instrument(File resultDir,
             outputs.add(resultDir);
         }
 
-        String condySetting = ConDySettings.disableConDy();
+        String previousConDySetting = ConDySettings.disableConDy();
         try {
             OfflineInstrumentationApi.instrument(originalDirs, outputs, convertFilters(filters), countHits);
         } finally {
-            ConDySettings.restoreConDy(condySetting);
+            ConDySettings.restoreConDy(previousConDySetting);
         }
     }
 
@@ -53,7 +53,7 @@ public static void instrument(File resultDir,
      * @param filters Filters to limit the classes that will be displayed in the report
      * @throws IOException In case of a report generation error
      */
-    public static void xmlReport(
+    public static void generateXmlReport(
             File xmlFile,
             List<File> binaryReports,
             List<File> classfileDirs,
@@ -75,7 +75,7 @@ public static void xmlReport(
      * @param filters Filters to limit the classes that will be displayed in the report.
      * @throws IOException In case of a report generation error
      */
-    public static void htmlReport(
+    public static void generateHtmlReport(
             File htmlDir,
             List<File> binaryReports,
             List<File> classfileDirs,

diff --git a/...er/features/java/OfflineInstrumenter.java → ...ver/features/jvm/OfflineInstrumenter.java b/...er/features/java/OfflineInstrumenter.java → ...ver/features/jvm/OfflineInstrumenter.java
@@ -1,4 +1,4 @@
-package kotlinx.kover.features.java;
+package kotlinx.kover.features.jvm;
 
 import java.io.IOException;
 import java.io.InputStream;

diff --git a/...eatures/java/OfflineInstrumenterImpl.java → ...features/jvm/OfflineInstrumenterImpl.java b/...eatures/java/OfflineInstrumenterImpl.java → ...features/jvm/OfflineInstrumenterImpl.java
@@ -1,4 +1,4 @@
-package kotlinx.kover.features.java;
+package kotlinx.kover.features.jvm;
 
 import com.intellij.rt.coverage.instrument.api.OfflineInstrumentationApi;
 
@@ -18,7 +18,7 @@ class OfflineInstrumenterImpl implements OfflineInstrumenter {
 
     @Override
     public byte[] instrument(InputStream originalClass, String debugName) throws IOException {
-        String condySetting = ConDySettings.disableConDy();
+        String previousConDySetting = ConDySettings.disableConDy();
 
         try {
             return OfflineInstrumentationApi.instrument(originalClass, countHits);
@@ -27,7 +27,7 @@ public byte[] instrument(InputStream originalClass, String debugName) throws IOE
                     String.format("Error while instrumenting '%s' with Kover instrumenter version '%s'",
                             debugName, KoverFeatures.getVersion()), e);
         } finally {
-            ConDySettings.restoreConDy(condySetting);
+            ConDySettings.restoreConDy(previousConDySetting);
         }
     }
 

diff --git a/...res-java/src/main/resources/kover.version → ...ures-jvm/src/main/resources/kover.version b/...res-java/src/main/resources/kover.version → ...ures-jvm/src/main/resources/kover.version
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -14,7 +14,7 @@ dependencyResolutionManagement {
     }
 }
 
-include(":kover-features-java")
+include(":kover-features-jvm")
 include(":kover-gradle-plugin")
 include(":kover-cli")
 include(":kover-offline-runtime")