Skip to content

Commit

Permalink
Correct plugin classes package
Browse files Browse the repository at this point in the history
  • Loading branch information
gmazzo committed Dec 17, 2023
1 parent 35d7c7d commit 2d7555a
Show file tree
Hide file tree
Showing 33 changed files with 89 additions and 105 deletions.
3 changes: 1 addition & 2 deletions demo-project/kts-android/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import com.android.build.gradle.internal.lint.AndroidLintAnalysisTask
import com.android.build.gradle.internal.lint.AndroidLintTask
import com.android.build.gradle.internal.lint.LintModelWriterTask
import com.github.gmazzo.gradle.plugins.BuildConfigTask
import com.github.gmazzo.buildconfig.BuildConfigTask

plugins {
alias(libs.plugins.android)
Expand Down
2 changes: 1 addition & 1 deletion demo-project/kts-multiplatform/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import com.github.gmazzo.gradle.plugins.BuildConfigSourceSet
import com.github.gmazzo.buildconfig.BuildConfigSourceSet

plugins {
alias(libs.plugins.kotlin.multiplatform)
Expand Down
6 changes: 3 additions & 3 deletions demo-project/kts/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import com.github.gmazzo.gradle.plugins.BuildConfigValue
import com.github.gmazzo.gradle.plugins.generators.BuildConfigGenerator
import com.github.gmazzo.gradle.plugins.generators.BuildConfigGeneratorSpec
import com.github.gmazzo.buildconfig.BuildConfigValue
import com.github.gmazzo.buildconfig.generators.BuildConfigGenerator
import com.github.gmazzo.buildconfig.generators.BuildConfigGeneratorSpec
import java.io.FileOutputStream
import java.util.Properties

Expand Down
2 changes: 1 addition & 1 deletion plugin/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ gradlePlugin {
create("buildconfig") {
id = "com.github.gmazzo.buildconfig"
displayName = name
implementationClass = "com.github.gmazzo.gradle.plugins.BuildConfigPlugin"
implementationClass = "com.github.gmazzo.buildconfig.BuildConfigPlugin"
description =
"A plugin for generating BuildConstants for any kind of Gradle projects: Java, Kotlin, Groovy, etc. Designed for KTS scripts."
tags.addAll("buildconfig", "java", "kotlin", "kotlin-multiplatform")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.gmazzo.gradle.plugins
package com.github.gmazzo.buildconfig

import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation.castToType
import org.gradle.api.Named
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.gmazzo.gradle.plugins
package com.github.gmazzo.buildconfig

@DslMarker
annotation class BuildConfigDsl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.gmazzo.gradle.plugins
package com.github.gmazzo.buildconfig

import org.gradle.api.Action
import org.gradle.api.NamedDomainObjectContainer
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.gmazzo.gradle.plugins
package com.github.gmazzo.buildconfig

import org.gradle.api.Named
import org.gradle.api.provider.Property
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package com.github.gmazzo.gradle.plugins

import com.github.gmazzo.gradle.plugins.generators.BuildConfigJavaGenerator
import com.github.gmazzo.gradle.plugins.internal.BuildConfigSourceSetInternal
import com.github.gmazzo.gradle.plugins.internal.DefaultBuildConfigExtension
import com.github.gmazzo.gradle.plugins.internal.DefaultBuildConfigSourceSet
import com.github.gmazzo.gradle.plugins.internal.bindings.JavaHandler
import com.github.gmazzo.gradle.plugins.internal.bindings.KotlinHandler
import com.github.gmazzo.gradle.plugins.internal.bindings.KotlinMultiplatformHandler
import com.github.gmazzo.gradle.plugins.internal.bindings.PluginBindingHandler
package com.github.gmazzo.buildconfig

import com.github.gmazzo.buildconfig.generators.BuildConfigJavaGenerator
import com.github.gmazzo.buildconfig.internal.BuildConfigSourceSetInternal
import com.github.gmazzo.buildconfig.internal.DefaultBuildConfigExtension
import com.github.gmazzo.buildconfig.internal.DefaultBuildConfigSourceSet
import com.github.gmazzo.buildconfig.internal.bindings.JavaHandler
import com.github.gmazzo.buildconfig.internal.bindings.KotlinHandler
import com.github.gmazzo.buildconfig.internal.bindings.KotlinMultiplatformHandler
import com.github.gmazzo.buildconfig.internal.bindings.PluginBindingHandler
import org.gradle.api.Action
import org.gradle.api.NamedDomainObjectContainer
import org.gradle.api.Plugin
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.github.gmazzo.gradle.plugins
package com.github.gmazzo.buildconfig

import com.github.gmazzo.gradle.plugins.generators.BuildConfigGenerator
import com.github.gmazzo.gradle.plugins.generators.BuildConfigJavaGenerator
import com.github.gmazzo.gradle.plugins.generators.BuildConfigKotlinGenerator
import com.github.gmazzo.buildconfig.generators.BuildConfigGenerator
import com.github.gmazzo.buildconfig.generators.BuildConfigJavaGenerator
import com.github.gmazzo.buildconfig.generators.BuildConfigKotlinGenerator
import org.gradle.api.Action
import org.gradle.api.provider.Property
import org.gradle.api.tasks.TaskProvider
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.github.gmazzo.gradle.plugins
package com.github.gmazzo.buildconfig

import com.github.gmazzo.gradle.plugins.generators.BuildConfigGenerator
import com.github.gmazzo.gradle.plugins.generators.BuildConfigGeneratorSpec
import com.github.gmazzo.buildconfig.generators.BuildConfigGenerator
import com.github.gmazzo.buildconfig.generators.BuildConfigGeneratorSpec
import org.gradle.api.DefaultTask
import org.gradle.api.file.DirectoryProperty
import org.gradle.api.provider.Property
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
package com.github.gmazzo.gradle.plugins
package com.github.gmazzo.buildconfig

import org.gradle.api.Named
import org.gradle.api.provider.Property
import org.gradle.api.provider.Provider
import org.gradle.api.tasks.Input
import java.io.Serializable
import java.lang.reflect.Type as JavaType

sealed class BuildConfigType<RefType : Serializable> : Serializable {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.gmazzo.gradle.plugins
package com.github.gmazzo.buildconfig

import org.gradle.api.NamedDomainObjectProvider
import org.gradle.api.provider.Provider
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
package com.github.gmazzo.gradle.plugins
package com.github.gmazzo.buildconfig

import org.gradle.api.Named
import org.gradle.api.provider.Property
import org.gradle.api.provider.Provider
import org.gradle.api.tasks.Input
import java.io.Serializable
import java.lang.reflect.Type as JavaType

sealed class BuildConfigValue : Serializable {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.gmazzo.gradle.plugins.generators
package com.github.gmazzo.buildconfig.generators

import org.gradle.api.Action

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.github.gmazzo.gradle.plugins.generators
package com.github.gmazzo.buildconfig.generators

import com.github.gmazzo.gradle.plugins.BuildConfigField
import com.github.gmazzo.buildconfig.BuildConfigField
import java.io.File

data class BuildConfigGeneratorSpec(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
package com.github.gmazzo.gradle.plugins.generators

import com.github.gmazzo.gradle.plugins.BuildConfigField
import com.github.gmazzo.gradle.plugins.BuildConfigType
import com.github.gmazzo.gradle.plugins.BuildConfigValue
import com.github.gmazzo.gradle.plugins.asVarArg
import com.github.gmazzo.gradle.plugins.elements
import com.github.gmazzo.gradle.plugins.parseTypename
package com.github.gmazzo.buildconfig.generators

import com.github.gmazzo.buildconfig.BuildConfigType
import com.github.gmazzo.buildconfig.BuildConfigValue
import com.github.gmazzo.buildconfig.asVarArg
import com.github.gmazzo.buildconfig.elements
import com.github.gmazzo.buildconfig.parseTypename
import com.squareup.javapoet.ArrayTypeName
import com.squareup.javapoet.ClassName
import com.squareup.javapoet.FieldSpec
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package com.github.gmazzo.gradle.plugins.generators

import com.github.gmazzo.gradle.plugins.BuildConfigField
import com.github.gmazzo.gradle.plugins.BuildConfigType
import com.github.gmazzo.gradle.plugins.BuildConfigValue
import com.github.gmazzo.gradle.plugins.asVarArg
import com.github.gmazzo.gradle.plugins.elements
import com.github.gmazzo.gradle.plugins.parseTypename
package com.github.gmazzo.buildconfig.generators

import com.github.gmazzo.buildconfig.BuildConfigField
import com.github.gmazzo.buildconfig.BuildConfigType
import com.github.gmazzo.buildconfig.BuildConfigValue
import com.github.gmazzo.buildconfig.asVarArg
import com.github.gmazzo.buildconfig.elements
import com.github.gmazzo.buildconfig.parseTypename
import com.squareup.kotlinpoet.ARRAY
import com.squareup.kotlinpoet.BOOLEAN
import com.squareup.kotlinpoet.BOOLEAN_ARRAY
Expand All @@ -31,11 +31,9 @@ import com.squareup.kotlinpoet.PropertySpec
import com.squareup.kotlinpoet.SET
import com.squareup.kotlinpoet.SHORT
import com.squareup.kotlinpoet.SHORT_ARRAY
import com.squareup.kotlinpoet.STAR
import com.squareup.kotlinpoet.STRING
import com.squareup.kotlinpoet.TypeName
import com.squareup.kotlinpoet.TypeSpec
import com.squareup.kotlinpoet.asClassName
import com.squareup.kotlinpoet.asTypeName
import org.gradle.api.logging.Logging
import org.gradle.api.tasks.Input
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.github.gmazzo.gradle.plugins.internal
package com.github.gmazzo.buildconfig.internal

import com.github.gmazzo.gradle.plugins.BuildConfigClassSpec
import com.github.gmazzo.gradle.plugins.BuildConfigSourceSet
import com.github.gmazzo.gradle.plugins.BuildConfigTask
import com.github.gmazzo.buildconfig.BuildConfigClassSpec
import com.github.gmazzo.buildconfig.BuildConfigSourceSet
import com.github.gmazzo.buildconfig.BuildConfigTask
import org.gradle.api.NamedDomainObjectContainer
import org.gradle.api.tasks.TaskProvider

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.github.gmazzo.gradle.plugins.internal
package com.github.gmazzo.buildconfig.internal

import com.github.gmazzo.gradle.plugins.BuildConfigClassSpec
import com.github.gmazzo.buildconfig.BuildConfigClassSpec
import javax.inject.Inject

internal abstract class DefaultBuildConfigClassSpec @Inject constructor() :
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.github.gmazzo.gradle.plugins.internal
package com.github.gmazzo.buildconfig.internal

import com.github.gmazzo.gradle.plugins.BuildConfigExtension
import com.github.gmazzo.buildconfig.BuildConfigExtension
import org.gradle.api.NamedDomainObjectContainer

internal open class DefaultBuildConfigExtension(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.github.gmazzo.gradle.plugins.internal
package com.github.gmazzo.buildconfig.internal

import com.github.gmazzo.gradle.plugins.BuildConfigClassSpec
import com.github.gmazzo.gradle.plugins.BuildConfigTask
import com.github.gmazzo.buildconfig.BuildConfigClassSpec
import com.github.gmazzo.buildconfig.BuildConfigTask
import org.gradle.api.NamedDomainObjectContainer
import org.gradle.api.model.ObjectFactory
import org.gradle.api.tasks.TaskProvider
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.github.gmazzo.gradle.plugins.internal
package com.github.gmazzo.buildconfig.internal

import com.github.gmazzo.gradle.plugins.BuildConfigClassSpec
import com.github.gmazzo.gradle.plugins.addField
import com.github.gmazzo.gradle.plugins.typeOf
import com.github.gmazzo.gradle.plugins.valueOf
import com.github.gmazzo.buildconfig.BuildConfigClassSpec
import com.github.gmazzo.buildconfig.addField
import com.github.gmazzo.buildconfig.typeOf
import com.github.gmazzo.buildconfig.valueOf
import groovy.lang.GroovyObjectSupport
import java.io.Serializable
import java.lang.reflect.Type
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.github.gmazzo.gradle.plugins.internal.bindings
package com.github.gmazzo.buildconfig.internal.bindings

import com.github.gmazzo.gradle.plugins.BuildConfigExtension
import com.github.gmazzo.gradle.plugins.BuildConfigSourceSet
import com.github.gmazzo.gradle.plugins.generators.BuildConfigJavaGenerator
import com.github.gmazzo.buildconfig.BuildConfigExtension
import com.github.gmazzo.buildconfig.BuildConfigSourceSet
import com.github.gmazzo.buildconfig.generators.BuildConfigJavaGenerator
import org.gradle.api.Project
import org.gradle.api.tasks.SourceSet
import org.gradle.api.tasks.SourceSetContainer
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.github.gmazzo.gradle.plugins.internal.bindings
package com.github.gmazzo.buildconfig.internal.bindings

import com.github.gmazzo.gradle.plugins.BuildConfigExtension
import com.github.gmazzo.gradle.plugins.BuildConfigSourceSet
import com.github.gmazzo.gradle.plugins.generators.BuildConfigKotlinGenerator
import com.github.gmazzo.buildconfig.BuildConfigExtension
import com.github.gmazzo.buildconfig.BuildConfigSourceSet
import com.github.gmazzo.buildconfig.generators.BuildConfigKotlinGenerator
import org.gradle.api.Named
import org.gradle.api.NamedDomainObjectContainer
import org.gradle.api.Project
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.gmazzo.gradle.plugins.internal.bindings
package com.github.gmazzo.buildconfig.internal.bindings

import org.gradle.api.Named
import org.gradle.api.tasks.SourceSet
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.github.gmazzo.gradle.plugins.internal.bindings
package com.github.gmazzo.buildconfig.internal.bindings

import com.github.gmazzo.gradle.plugins.BuildConfigSourceSet
import com.github.gmazzo.buildconfig.BuildConfigSourceSet
import org.gradle.api.NamedDomainObjectContainer

internal interface PluginBindingHandler<SourceSet> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package org.gradle.kotlin.dsl

import com.github.gmazzo.gradle.plugins.BuildConfigClassSpec
import com.github.gmazzo.gradle.plugins.addField
import com.github.gmazzo.gradle.plugins.nameOf
import com.github.gmazzo.gradle.plugins.valueOf
import com.github.gmazzo.buildconfig.BuildConfigClassSpec
import com.github.gmazzo.buildconfig.addField
import com.github.gmazzo.buildconfig.nameOf
import com.github.gmazzo.buildconfig.valueOf
import org.gradle.api.provider.Provider
import java.io.Serializable
import kotlin.reflect.typeOf
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.gmazzo.gradle.plugins
package com.github.gmazzo.buildconfig

import org.gradle.testkit.runner.GradleRunner
import org.gradle.testkit.runner.TaskOutcome
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
package com.github.gmazzo.gradle.plugins
package com.github.gmazzo.buildconfig

import org.gradle.testkit.runner.GradleRunner
import org.gradle.testkit.runner.TaskOutcome
import org.junit.jupiter.api.BeforeAll
import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test
import org.junit.jupiter.api.TestInstance
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.github.gmazzo.gradle.plugins
package com.github.gmazzo.buildconfig

import com.github.gmazzo.gradle.plugins.generators.BuildConfigGenerator
import com.github.gmazzo.gradle.plugins.generators.BuildConfigGeneratorSpec
import com.github.gmazzo.gradle.plugins.internal.DefaultBuildConfigClassSpec
import com.github.gmazzo.buildconfig.generators.BuildConfigGenerator
import com.github.gmazzo.buildconfig.generators.BuildConfigGeneratorSpec
import com.github.gmazzo.buildconfig.internal.DefaultBuildConfigClassSpec
import io.mockk.mockk
import io.mockk.verify
import org.gradle.kotlin.dsl.create
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.github.gmazzo.gradle.plugins
package com.github.gmazzo.buildconfig

import com.github.gmazzo.gradle.plugins.BuildConfigType.NameRef
import com.github.gmazzo.buildconfig.BuildConfigType.NameRef
import kotlin.test.Test
import kotlin.test.assertEquals

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
package com.github.gmazzo.gradle.plugins.generators
package com.github.gmazzo.buildconfig.generators

import com.github.gmazzo.gradle.plugins.parseTypename
import com.github.gmazzo.buildconfig.parseTypename
import kotlin.test.Test
import kotlin.test.assertEquals
import kotlin.test.assertFails
import kotlin.test.assertFailsWith
import kotlin.test.expect

class BuildConfigGeneratorUtilsTest {

Expand Down

0 comments on commit 2d7555a

Please sign in to comment.