Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions tapmoc-gradle-plugin/api/tapmoc-gradle-plugin.api
Original file line number Diff line number Diff line change
@@ -1,40 +1,40 @@
public final class tapmoc/CompatibilityKt {
public final class com/gradleup/tapmoc/CompatibilityKt {
public static final fun configureJavaCompatibility (Lorg/gradle/api/Project;I)V
public static final fun configureKotlinCompatibility (Lorg/gradle/api/Project;Ljava/lang/String;)V
}

public final class tapmoc/Severity : java/lang/Enum {
public static final field ERROR Ltapmoc/Severity;
public static final field IGNORE Ltapmoc/Severity;
public static final field WARNING Ltapmoc/Severity;
public final class com/gradleup/tapmoc/Severity : java/lang/Enum {
public static final field ERROR Lcom/gradleup/tapmoc/Severity;
public static final field IGNORE Lcom/gradleup/tapmoc/Severity;
public static final field WARNING Lcom/gradleup/tapmoc/Severity;
public static fun getEntries ()Lkotlin/enums/EnumEntries;
public static fun valueOf (Ljava/lang/String;)Ltapmoc/Severity;
public static fun values ()[Ltapmoc/Severity;
public static fun valueOf (Ljava/lang/String;)Lcom/gradleup/tapmoc/Severity;
public static fun values ()[Lcom/gradleup/tapmoc/Severity;
}

public abstract interface class tapmoc/TapmocExtension {
public abstract fun checkApiDependencies (Ltapmoc/Severity;)V
public abstract interface class com/gradleup/tapmoc/TapmocExtension {
public abstract fun checkApiDependencies (Lcom/gradleup/tapmoc/Severity;)V
public abstract fun checkDependencies ()V
public abstract fun checkDependencies (Lcom/gradleup/tapmoc/Severity;)V
public abstract fun checkDependencies (Lorg/gradle/api/provider/Provider;)V
public abstract fun checkDependencies (Ltapmoc/Severity;)V
public abstract fun checkJavaClassFiles (Lcom/gradleup/tapmoc/Severity;)V
public abstract fun checkJavaClassFiles (Ljava/lang/String;Lorg/gradle/api/provider/Provider;)V
public abstract fun checkJavaClassFiles (Lorg/gradle/api/provider/Provider;)V
public abstract fun checkJavaClassFiles (Ltapmoc/Severity;)V
public abstract fun checkKotlinMetadata (Lcom/gradleup/tapmoc/Severity;)V
public abstract fun checkKotlinMetadata (Ljava/lang/String;Lorg/gradle/api/provider/Provider;)V
public abstract fun checkKotlinMetadata (Lorg/gradle/api/provider/Provider;)V
public abstract fun checkKotlinMetadata (Ltapmoc/Severity;)V
public abstract fun checkKotlinStdlibs (Lcom/gradleup/tapmoc/Severity;)V
public abstract fun checkKotlinStdlibs (Ljava/lang/String;Lorg/gradle/api/provider/Provider;)V
public abstract fun checkKotlinStdlibs (Lorg/gradle/api/provider/Provider;)V
public abstract fun checkKotlinStdlibs (Ltapmoc/Severity;)V
public abstract fun checkRuntimeDependencies (Ltapmoc/Severity;)V
public abstract fun checkRuntimeDependencies (Lcom/gradleup/tapmoc/Severity;)V
public abstract fun gradle (Ljava/lang/String;)V
public abstract fun java (I)V
public abstract fun javaVersionForGradle (Ljava/lang/String;)I
public abstract fun kotlin (Ljava/lang/String;)V
public abstract fun kotlinVersionForGradle (Ljava/lang/String;)Ljava/lang/String;
}

public abstract class tapmoc/TapmocPlugin : org/gradle/api/Plugin {
public abstract class com/gradleup/tapmoc/TapmocPlugin : org/gradle/api/Plugin {
public fun <init> ()V
public synthetic fun apply (Ljava/lang/Object;)V
public fun apply (Lorg/gradle/api/Project;)V
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package tapmoc.internal
package com.gradleup.tapmoc.internal

import org.gradle.api.JavaVersion

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package tapmoc.internal
package com.gradleup.tapmoc.internal

import com.android.build.api.dsl.CommonExtension
import org.gradle.api.Action
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package tapmoc.internal
package com.gradleup.tapmoc.internal

import org.gradle.api.Project

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package tapmoc.internal
package com.gradleup.tapmoc.internal

import org.gradle.api.NamedDomainObjectContainer
import org.gradle.api.NamedDomainObjectSet
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package tapmoc
package com.gradleup.tapmoc

import org.gradle.api.provider.Provider

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package tapmoc
package com.gradleup.tapmoc

import tapmoc.internal.TapmocExtensionImpl
import com.gradleup.tapmoc.internal.TapmocExtensionImpl
import gratatouille.GPlugin
import org.gradle.api.Project

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package tapmoc
package com.gradleup.tapmoc

import tapmoc.internal.onAgp
import com.gradleup.tapmoc.internal.onAgp
import org.gradle.api.JavaVersion
import org.gradle.api.Project
import org.gradle.api.tasks.compile.JavaCompile
import tapmoc.internal.onKgp
import com.gradleup.tapmoc.internal.onKgp

fun Project.configureJavaCompatibility(
javaVersion: Int,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package tapmoc.internal
package com.gradleup.tapmoc.internal

import org.gradle.api.NamedDomainObjectProvider
import org.gradle.api.Project
Expand All @@ -11,13 +11,13 @@ import org.gradle.api.provider.Property
import org.gradle.api.provider.Provider
import org.gradle.api.tasks.TaskProvider
import org.gradle.language.base.plugins.LifecycleBasePlugin
import tapmoc.Severity
import tapmoc.TapmocExtension
import tapmoc.configureJavaCompatibility
import tapmoc.configureKotlinCompatibility
import tapmoc.task.registerTapmocCheckClassFileVersionsTask
import tapmoc.task.registerTapmocCheckKotlinMetadataVersionsTask
import tapmoc.task.registerTapmocCheckKotlinStdlibVersionsTask
import com.gradleup.tapmoc.Severity
import com.gradleup.tapmoc.TapmocExtension
import com.gradleup.tapmoc.configureJavaCompatibility
import com.gradleup.tapmoc.configureKotlinCompatibility
import com.gradleup.tapmoc.task.registerTapmocCheckClassFileVersionsTask
import com.gradleup.tapmoc.task.registerTapmocCheckKotlinMetadataVersionsTask
import com.gradleup.tapmoc.task.registerTapmocCheckKotlinStdlibVersionsTask

internal abstract class TapmocExtensionImpl(private val project: Project) : TapmocExtension {
abstract val kotlinVersionProvider: Property<String>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package tapmoc.internal
package com.gradleup.tapmoc.internal

internal fun kotlinVersionForGradle(major: Int): String {
/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import tapmoc.Severity
import com.gradleup.tapmoc.Severity

buildscript {
dependencies {
Expand All @@ -11,7 +11,7 @@ plugins {
}

pluginManager.apply("com.gradleup.tapmoc")
extensions.getByType(tapmoc.TapmocExtension::class.java).apply {
extensions.getByType(com.gradleup.tapmoc.TapmocExtension::class.java).apply {
java(11)
kotlin("1.9.0")
checkDependencies(Severity.WARNING)
Expand Down
4 changes: 2 additions & 2 deletions tapmoc-gradle-plugin/testProjects/gradle-8-0/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import tapmoc.Severity
import com.gradleup.tapmoc.Severity

plugins {
id("java")
id("com.gradleup.tapmoc").version("PLACEHOLDER")
}

extensions.getByType(tapmoc.TapmocExtension::class.java).apply {
extensions.getByType(com.gradleup.tapmoc.TapmocExtension::class.java).apply {
java(8)
checkDependencies(Severity.ERROR)
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import tapmoc.Severity
import com.gradleup.tapmoc.Severity

buildscript {
dependencies {
Expand All @@ -11,7 +11,7 @@ plugins {
}

pluginManager.apply("com.gradleup.tapmoc")
extensions.getByType(tapmoc.TapmocExtension::class.java).apply {
extensions.getByType(com.gradleup.tapmoc.TapmocExtension::class.java).apply {
java(8)
checkDependencies(Severity.ERROR)
}
Expand Down
4 changes: 2 additions & 2 deletions tapmoc-gradle-plugin/testProjects/java/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import javax.tools.DiagnosticCollector
import javax.tools.JavaFileObject
import javax.tools.StandardLocation
import javax.tools.ToolProvider
import tapmoc.Severity
import com.gradleup.tapmoc.Severity

buildscript {
dependencies {
Expand All @@ -15,7 +15,7 @@ plugins {
}

pluginManager.apply("com.gradleup.tapmoc")
extensions.getByType(tapmoc.TapmocExtension::class.java).apply {
extensions.getByType(com.gradleup.tapmoc.TapmocExtension::class.java).apply {
java(8)
kotlin("2.0.0") // This should be a no-op
checkDependencies(Severity.ERROR)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import tapmoc.Severity
import com.gradleup.tapmoc.Severity

buildscript {
dependencies {
Expand All @@ -12,7 +12,7 @@ plugins {

pluginManager.apply("com.gradleup.tapmoc")

extensions.getByType(tapmoc.TapmocExtension::class.java).apply {
extensions.getByType(com.gradleup.tapmoc.TapmocExtension::class.java).apply {
java(8)
kotlin("2.3.0") // This should make an error
}
18 changes: 9 additions & 9 deletions tapmoc-tasks/api/tapmoc-tasks.api
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
public final class tapmoc/task/TapmocCheckClassFileVersionsEntryPoint {
public static final field Companion Ltapmoc/task/TapmocCheckClassFileVersionsEntryPoint$Companion;
public final class com/gradleup/tapmoc/task/TapmocCheckClassFileVersionsEntryPoint {
public static final field Companion Lcom/gradleup/tapmoc/task/TapmocCheckClassFileVersionsEntryPoint$Companion;
public fun <init> ()V
public static final fun run (Ljava/util/function/BiConsumer;Ljava/lang/String;Ljava/util/List;Ljava/lang/Integer;Ljava/io/File;)V
}

public final class tapmoc/task/TapmocCheckClassFileVersionsEntryPoint$Companion {
public final class com/gradleup/tapmoc/task/TapmocCheckClassFileVersionsEntryPoint$Companion {
public final fun run (Ljava/util/function/BiConsumer;Ljava/lang/String;Ljava/util/List;Ljava/lang/Integer;Ljava/io/File;)V
}

public final class tapmoc/task/TapmocCheckKotlinMetadataVersionsEntryPoint {
public static final field Companion Ltapmoc/task/TapmocCheckKotlinMetadataVersionsEntryPoint$Companion;
public final class com/gradleup/tapmoc/task/TapmocCheckKotlinMetadataVersionsEntryPoint {
public static final field Companion Lcom/gradleup/tapmoc/task/TapmocCheckKotlinMetadataVersionsEntryPoint$Companion;
public fun <init> ()V
public static final fun run (Ljava/util/function/BiConsumer;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/io/File;)V
}

public final class tapmoc/task/TapmocCheckKotlinMetadataVersionsEntryPoint$Companion {
public final class com/gradleup/tapmoc/task/TapmocCheckKotlinMetadataVersionsEntryPoint$Companion {
public final fun run (Ljava/util/function/BiConsumer;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/io/File;)V
}

public final class tapmoc/task/TapmocCheckKotlinStdlibVersionsEntryPoint {
public static final field Companion Ltapmoc/task/TapmocCheckKotlinStdlibVersionsEntryPoint$Companion;
public final class com/gradleup/tapmoc/task/TapmocCheckKotlinStdlibVersionsEntryPoint {
public static final field Companion Lcom/gradleup/tapmoc/task/TapmocCheckKotlinStdlibVersionsEntryPoint$Companion;
public fun <init> ()V
public static final fun run (Ljava/util/function/BiConsumer;Ljava/lang/String;Ljava/lang/String;Ljava/util/Set;Ljava/io/File;)V
}

public final class tapmoc/task/TapmocCheckKotlinStdlibVersionsEntryPoint$Companion {
public final class com/gradleup/tapmoc/task/TapmocCheckKotlinStdlibVersionsEntryPoint$Companion {
public final fun run (Ljava/util/function/BiConsumer;Ljava/lang/String;Ljava/lang/String;Ljava/util/Set;Ljava/io/File;)V
}

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package tapmoc.task
package com.gradleup.tapmoc.task

import gratatouille.tasks.GInputFiles
import gratatouille.tasks.GLogger
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package tapmoc.task
package com.gradleup.tapmoc.task

import gratatouille.tasks.GClasspath
import gratatouille.tasks.GLogger
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package tapmoc.task
package com.gradleup.tapmoc.task

import gratatouille.tasks.GLogger
import gratatouille.tasks.GOutputFile
Expand Down
2 changes: 1 addition & 1 deletion tapmoc-tasks/src/test/kotlin/ClassFileVersionTest.kt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import gratatouille.tasks.FileWithPath
import gratatouille.tasks.GLogger
import org.junit.Test
import tapmoc.task.tapmocCheckClassFileVersions
import com.gradleup.tapmoc.task.tapmocCheckClassFileVersions
import java.io.File
import java.net.URI
import kotlin.test.assertFailsWith
Expand Down
2 changes: 1 addition & 1 deletion tests/agp8-java/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import com.android.build.gradle.internal.tasks.factory.dependsOn
import tapmoc.Severity
import com.gradleup.tapmoc.Severity

plugins {
alias(libs.plugins.agp8)
Expand Down
2 changes: 1 addition & 1 deletion tests/agp8-kotlin/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import tapmoc.Severity
import com.gradleup.tapmoc.Severity

plugins {
alias(libs.plugins.agp8)
Expand Down
2 changes: 1 addition & 1 deletion tests/agp9-kmp/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import tapmoc.Severity
import com.gradleup.tapmoc.Severity

plugins {
alias(libs.plugins.agp9.kmp)
Expand Down
2 changes: 1 addition & 1 deletion tests/agp9-kotlin/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import tapmoc.Severity
import com.gradleup.tapmoc.Severity

plugins {
alias(libs.plugins.agp9.library)
Expand Down
2 changes: 1 addition & 1 deletion tests/gradle-plugin/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import tapmoc.Severity
import com.gradleup.tapmoc.Severity

plugins {
id("com.gradleup.tapmoc")
Expand Down
Loading