Skip to content

Commit eddaa6a

Browse files
committed
Move MokkeryConfig to internal package
1 parent e5448aa commit eddaa6a

File tree

10 files changed

+14
-16
lines changed

10 files changed

+14
-16
lines changed

mokkery-core-tooling/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ dependencies {
2020

2121
buildConfig {
2222
val pluginProject = project(":mokkery-plugin")
23-
packageName(rootProject.group.toString())
23+
packageName("dev.mokkery.internal")
2424
buildConfigField("String", "GROUP", str(rootProject.group))
2525
buildConfigField("String", "VERSION", str(rootProject.version))
2626
buildConfigField("String", "RUNTIME", str("mokkery-runtime"))

mokkery-core-tooling/src/main/kotlin/dev/mokkery/MokkeryConfig.kt renamed to mokkery-core-tooling/src/main/kotlin/dev/mokkery/internal/MokkeryConfig.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package dev.mokkery
1+
package dev.mokkery.internal
22

33
import dev.mokkery.annotations.InternalMokkeryApi
44

mokkery-gradle/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
@file:Suppress("UnstableApiUsage")
22

3+
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
34
import org.jetbrains.kotlin.konan.target.HostManager
45
import org.jetbrains.kotlin.konan.target.KonanTarget
5-
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
66

77
plugins {
88
kotlin("jvm")
@@ -49,7 +49,7 @@ val functionalTest by testing.suites.creating(JvmTestSuite::class) {
4949

5050
buildConfig {
5151
functionalTest.sources {
52-
packageName("${project.group}.gradle")
52+
packageName("dev.mokkery.gradle")
5353
val testingRepository = publishing.repositories
5454
.find { it.name == "testing" }
5555
.let { it as MavenArtifactRepository }
@@ -68,7 +68,7 @@ gradlePlugin {
6868
displayName = MokkeryAttributes.DisplayName
6969
description = MokkeryAttributes.Description
7070
version = project.version
71-
implementationClass = "${project.group}.gradle.MokkeryGradlePlugin"
71+
implementationClass = "dev.mokkery.gradle.MokkeryGradlePlugin"
7272
tags.set(
7373
listOf(
7474
"kotlin",

mokkery-gradle/src/functionalTest/kotlin/dev/mokkery/gradle/MokkeryGradlePluginFunctionalTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package dev.mokkery.gradle
22

3-
import dev.mokkery.MokkeryConfig
3+
import dev.mokkery.internal.MokkeryConfig
44
import org.gradle.testkit.runner.GradleRunner
55
import org.intellij.lang.annotations.Language
66
import org.junit.jupiter.api.Test

mokkery-gradle/src/main/kotlin/dev/mokkery/gradle/DependencyBuilder.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package dev.mokkery.gradle
22

3-
import dev.mokkery.MokkeryConfig
3+
import dev.mokkery.internal.MokkeryConfig
44
import org.gradle.api.artifacts.dsl.DependencyHandler
55
import org.jetbrains.kotlin.gradle.plugin.KotlinDependencyHandler
66

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package dev.mokkery.gradle
22

3-
import dev.mokkery.MokkeryConfig
3+
import dev.mokkery.internal.MokkeryConfig
44
import org.gradle.api.Project
55

66
internal fun Project.mokkeryInfo(message: String) = logger.info("${MokkeryConfig.PLUGIN_ID}: " + message)

mokkery-gradle/src/main/kotlin/dev/mokkery/gradle/MokkeryGradlePlugin.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
package dev.mokkery.gradle
44

5-
import dev.mokkery.MokkeryConfig
6-
import dev.mokkery.MokkeryConfig.RUNTIME_DEPENDENCY
7-
import dev.mokkery.MokkeryConfig.VERSION
5+
import dev.mokkery.internal.MokkeryConfig
6+
import dev.mokkery.internal.MokkeryConfig.RUNTIME_DEPENDENCY
7+
import dev.mokkery.internal.MokkeryConfig.VERSION
88
import dev.mokkery.internal.options.MokkeryOptionProjection
99
import dev.mokkery.internal.options.MokkeryOptions
1010
import dev.mokkery.internal.options.get

mokkery-plugin/src/main/kotlin/dev/mokkery/plugin/MokkeryCommandLineProcessor.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
package dev.mokkery.plugin
22

33
import com.google.auto.service.AutoService
4-
import dev.mokkery.MokkeryConfig
4+
import dev.mokkery.internal.MokkeryConfig
55
import dev.mokkery.internal.options.MokkeryOptions
6-
import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity
76
import org.jetbrains.kotlin.compiler.plugin.AbstractCliOption
87
import org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor
98
import org.jetbrains.kotlin.config.CompilerConfiguration
10-
import org.jetbrains.kotlin.config.messageCollector
119

1210
@AutoService(CommandLineProcessor::class)
1311
class MokkeryCommandLineProcessor : CommandLineProcessor {

mokkery-plugin/src/main/kotlin/dev/mokkery/plugin/MokkeryCompilerPluginRegistrar.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package dev.mokkery.plugin
22

33
import com.google.auto.service.AutoService
4-
import dev.mokkery.MokkeryConfig
4+
import dev.mokkery.internal.MokkeryConfig
55
import org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension
66
import org.jetbrains.kotlin.compiler.plugin.CompilerPluginRegistrar
77
import org.jetbrains.kotlin.config.CompilerConfiguration

mokkery-plugin/src/main/kotlin/dev/mokkery/plugin/ir/transformer/core/LogApi.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package dev.mokkery.plugin.ir.transformer.core
22

3-
import dev.mokkery.MokkeryConfig
3+
import dev.mokkery.internal.MokkeryConfig
44
import dev.mokkery.plugin.ir.messageCollector
55
import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity
66

0 commit comments

Comments
 (0)