Updated proper publishing settings for the new plugin version

btkelly · Oct 31, 2024 · d731e92 · d731e92
1 parent 678d499
commit d731e92
Show file tree

Hide file tree

Showing 61 changed files with 204 additions and 144 deletions.
diff --git a/plugin/build.gradle → gnag/build.gradle b/plugin/build.gradle → gnag/build.gradle
@@ -1,13 +1,12 @@
 plugins {
-    id 'maven-publish'
     id 'java-gradle-plugin'
     id "com.gradle.plugin-publish" version "1.3.0"
 }
 
 apply plugin: 'groovy'
 apply from: file('../version.gradle')
 
-group 'com.btkelly'
+group 'com.btkelly.gnag'
 version gnagPluginVersion
 
 repositories {
@@ -41,29 +40,16 @@ java {
     withSourcesJar()
 }
 
-publishing {
-    publications {
-        GnagPublication(MavenPublication) {
-            from components.java
-            artifactId gnagArtifactId
-        }
-    }
-}
-
-pluginBundle {
+gradlePlugin {
     website = gnagWebsite
     vcsUrl = gnagGitUrl
-    tags = gnagLabels
-}
-
-gradlePlugin {
     plugins {
         gnagPlugin {
             id = gnagPackageId
-            version = gnagPluginVersion
             displayName = gnagPluginName
             description = gnagDescription
             implementationClass = "com.btkelly.gnag.GnagPlugin"
+            tags = gnagLabels
         }
     }
 }
diff --git a/...groovy/com/btkelly/gnag/GnagPlugin.groovy → ...groovy/com/btkelly/gnag/GnagPlugin.groovy b/...groovy/com/btkelly/gnag/GnagPlugin.groovy → ...groovy/com/btkelly/gnag/GnagPlugin.groovy
diff --git a/...com/btkelly/gnag/api/AuthInterceptor.java → ...com/btkelly/gnag/api/AuthInterceptor.java b/...com/btkelly/gnag/api/AuthInterceptor.java → ...com/btkelly/gnag/api/AuthInterceptor.java
diff --git a/...roovy/com/btkelly/gnag/api/GitHubApi.java → ...roovy/com/btkelly/gnag/api/GitHubApi.java b/...roovy/com/btkelly/gnag/api/GitHubApi.java → ...roovy/com/btkelly/gnag/api/GitHubApi.java
diff --git a/...com/btkelly/gnag/api/GitHubApiClient.java → ...com/btkelly/gnag/api/GitHubApiClient.java b/...com/btkelly/gnag/api/GitHubApiClient.java → ...com/btkelly/gnag/api/GitHubApiClient.java
diff --git a/...tkelly/gnag/api/UserAgentInterceptor.java → ...tkelly/gnag/api/UserAgentInterceptor.java b/...tkelly/gnag/api/UserAgentInterceptor.java → ...tkelly/gnag/api/UserAgentInterceptor.java
diff --git a/...gnag/extensions/AndroidLintExtension.java → ...gnag/extensions/AndroidLintExtension.java b/...gnag/extensions/AndroidLintExtension.java → ...gnag/extensions/AndroidLintExtension.java
diff --git a/...elly/gnag/extensions/GitHubExtension.java → ...elly/gnag/extensions/GitHubExtension.java b/...elly/gnag/extensions/GitHubExtension.java → ...elly/gnag/extensions/GitHubExtension.java
diff --git a/.../gnag/extensions/GnagPluginExtension.java → .../gnag/extensions/GnagPluginExtension.java b/.../gnag/extensions/GnagPluginExtension.java → .../gnag/extensions/GnagPluginExtension.java
diff --git a/...ly/gnag/extensions/ReporterExtension.java → ...ly/gnag/extensions/ReporterExtension.java b/...ly/gnag/extensions/ReporterExtension.java → ...ly/gnag/extensions/ReporterExtension.java
diff --git a/.../com/btkelly/gnag/models/CheckStatus.java → .../com/btkelly/gnag/models/CheckStatus.java b/.../com/btkelly/gnag/models/CheckStatus.java → .../com/btkelly/gnag/models/CheckStatus.java
diff --git a/...com/btkelly/gnag/models/GitHubCommit.java → ...com/btkelly/gnag/models/GitHubCommit.java b/...com/btkelly/gnag/models/GitHubCommit.java → ...com/btkelly/gnag/models/GitHubCommit.java
diff --git a/...elly/gnag/models/GitHubInlineComment.java → ...elly/gnag/models/GitHubInlineComment.java b/...elly/gnag/models/GitHubInlineComment.java → ...elly/gnag/models/GitHubInlineComment.java
diff --git a/.../btkelly/gnag/models/GitHubPRComment.java → .../btkelly/gnag/models/GitHubPRComment.java b/.../btkelly/gnag/models/GitHubPRComment.java → .../btkelly/gnag/models/GitHubPRComment.java
diff --git a/.../btkelly/gnag/models/GitHubPRDetails.java → .../btkelly/gnag/models/GitHubPRDetails.java b/.../btkelly/gnag/models/GitHubPRDetails.java → .../btkelly/gnag/models/GitHubPRDetails.java
diff --git a/...com/btkelly/gnag/models/GitHubStatus.java → ...com/btkelly/gnag/models/GitHubStatus.java b/...com/btkelly/gnag/models/GitHubStatus.java → ...com/btkelly/gnag/models/GitHubStatus.java
diff --git a/...btkelly/gnag/models/GitHubStatusType.java → ...btkelly/gnag/models/GitHubStatusType.java b/...btkelly/gnag/models/GitHubStatusType.java → ...btkelly/gnag/models/GitHubStatusType.java
diff --git a/...y/com/btkelly/gnag/models/PRLocation.java → ...y/com/btkelly/gnag/models/PRLocation.java b/...y/com/btkelly/gnag/models/PRLocation.java → ...y/com/btkelly/gnag/models/PRLocation.java
diff --git a/...vy/com/btkelly/gnag/models/Violation.java → ...vy/com/btkelly/gnag/models/Violation.java b/...vy/com/btkelly/gnag/models/Violation.java → ...vy/com/btkelly/gnag/models/Violation.java
diff --git a/...rters/AndroidLintViolationDetector.groovy → ...rters/AndroidLintViolationDetector.groovy b/...rters/AndroidLintViolationDetector.groovy → ...rters/AndroidLintViolationDetector.groovy
diff --git a/...ag/reporters/BaseViolationDetector.groovy → ...ag/reporters/BaseViolationDetector.groovy b/...ag/reporters/BaseViolationDetector.groovy → ...ag/reporters/BaseViolationDetector.groovy
diff --git a/...orters/CheckstyleViolationDetector.groovy → ...orters/CheckstyleViolationDetector.groovy b/...orters/CheckstyleViolationDetector.groovy → ...orters/CheckstyleViolationDetector.groovy
diff --git a/.../reporters/DetektViolationDetector.groovy → .../reporters/DetektViolationDetector.groovy b/.../reporters/DetektViolationDetector.groovy → .../reporters/DetektViolationDetector.groovy
diff --git a/.../reporters/KtlintViolationDetector.groovy → .../reporters/KtlintViolationDetector.groovy b/.../reporters/KtlintViolationDetector.groovy → .../reporters/KtlintViolationDetector.groovy
diff --git a/...nag/reporters/PMDViolationDetector.groovy → ...nag/reporters/PMDViolationDetector.groovy b/...nag/reporters/PMDViolationDetector.groovy → ...nag/reporters/PMDViolationDetector.groovy
diff --git a/...y/gnag/reporters/ViolationDetector.groovy → ...y/gnag/reporters/ViolationDetector.groovy b/...y/gnag/reporters/ViolationDetector.groovy → ...y/gnag/reporters/ViolationDetector.groovy
diff --git a/...g/reporters/utils/CheckstyleParser.groovy → ...g/reporters/utils/CheckstyleParser.groovy b/...g/reporters/utils/CheckstyleParser.groovy → ...g/reporters/utils/CheckstyleParser.groovy
diff --git a/...g/reporters/utils/LineNumberParser.groovy → ...g/reporters/utils/LineNumberParser.groovy b/...g/reporters/utils/LineNumberParser.groovy → ...g/reporters/utils/LineNumberParser.groovy
diff --git a/...nag/reporters/utils/PathCalculator.groovy → ...nag/reporters/utils/PathCalculator.groovy b/...nag/reporters/utils/PathCalculator.groovy → ...nag/reporters/utils/PathCalculator.groovy
diff --git a/...com/btkelly/gnag/tasks/GnagCheckTask.java → ...com/btkelly/gnag/tasks/GnagCheckTask.java b/...com/btkelly/gnag/tasks/GnagCheckTask.java → ...com/btkelly/gnag/tasks/GnagCheckTask.java
diff --git a/...om/btkelly/gnag/tasks/GnagReportTask.java → ...om/btkelly/gnag/tasks/GnagReportTask.java b/...om/btkelly/gnag/tasks/GnagReportTask.java → ...om/btkelly/gnag/tasks/GnagReportTask.java
diff --git a/...btkelly/gnag/utils/HtmlStringBuilder.java → ...btkelly/gnag/utils/HtmlStringBuilder.java b/...btkelly/gnag/utils/HtmlStringBuilder.java → ...btkelly/gnag/utils/HtmlStringBuilder.java
diff --git a/...m/btkelly/gnag/utils/ProjectHelper.groovy → ...m/btkelly/gnag/utils/ProjectHelper.groovy b/...m/btkelly/gnag/utils/ProjectHelper.groovy → ...m/btkelly/gnag/utils/ProjectHelper.groovy
diff --git a/.../com/btkelly/gnag/utils/ReportWriter.java → .../com/btkelly/gnag/utils/ReportWriter.java b/.../com/btkelly/gnag/utils/ReportWriter.java → .../com/btkelly/gnag/utils/ReportWriter.java
diff --git a/...y/com/btkelly/gnag/utils/StringUtils.java → ...y/com/btkelly/gnag/utils/StringUtils.java b/...y/com/btkelly/gnag/utils/StringUtils.java → ...y/com/btkelly/gnag/utils/StringUtils.java
diff --git a/...tkelly/gnag/utils/ViolationFormatter.java → ...tkelly/gnag/utils/ViolationFormatter.java b/...tkelly/gnag/utils/ViolationFormatter.java → ...tkelly/gnag/utils/ViolationFormatter.java
diff --git a/...kelly/gnag/utils/ViolationsFormatter.java → ...kelly/gnag/utils/ViolationsFormatter.java b/...kelly/gnag/utils/ViolationsFormatter.java → ...kelly/gnag/utils/ViolationsFormatter.java
diff --git a/...om/btkelly/gnag/utils/ViolationsUtil.java → ...om/btkelly/gnag/utils/ViolationsUtil.java b/...om/btkelly/gnag/utils/ViolationsUtil.java → ...om/btkelly/gnag/utils/ViolationsUtil.java
diff --git a/...iffparser/DiffParserConverterFactory.java → ...iffparser/DiffParserConverterFactory.java b/...iffparser/DiffParserConverterFactory.java → ...iffparser/DiffParserConverterFactory.java
diff --git a/...rser/DiffParserResponseBodyConverter.java → ...rser/DiffParserResponseBodyConverter.java b/...rser/DiffParserResponseBodyConverter.java → ...rser/DiffParserResponseBodyConverter.java
diff --git a/...gnag/utils/gson/GsonConverterFactory.java → ...gnag/utils/gson/GsonConverterFactory.java b/...gnag/utils/gson/GsonConverterFactory.java → ...gnag/utils/gson/GsonConverterFactory.java
diff --git a/.../utils/gson/GsonRequestBodyConverter.java → .../utils/gson/GsonRequestBodyConverter.java b/.../utils/gson/GsonRequestBodyConverter.java → .../utils/gson/GsonRequestBodyConverter.java
diff --git a/...utils/gson/GsonResponseBodyConverter.java → ...utils/gson/GsonResponseBodyConverter.java b/...utils/gson/GsonResponseBodyConverter.java → ...utils/gson/GsonResponseBodyConverter.java
diff --git a/...ub/stkent/githubdiffparser/Constants.java → ...ub/stkent/githubdiffparser/Constants.java b/...ub/stkent/githubdiffparser/Constants.java → ...ub/stkent/githubdiffparser/Constants.java
diff --git a/...nt/githubdiffparser/GitHubDiffParser.java → ...nt/githubdiffparser/GitHubDiffParser.java b/...nt/githubdiffparser/GitHubDiffParser.java → ...nt/githubdiffparser/GitHubDiffParser.java
diff --git a/.../stkent/githubdiffparser/ParseWindow.java → .../stkent/githubdiffparser/ParseWindow.java b/.../stkent/githubdiffparser/ParseWindow.java → .../stkent/githubdiffparser/ParseWindow.java
diff --git a/.../stkent/githubdiffparser/ParserState.java → .../stkent/githubdiffparser/ParserState.java b/.../stkent/githubdiffparser/ParserState.java → .../stkent/githubdiffparser/ParserState.java
diff --git a/...githubdiffparser/ResizingParseWindow.java → ...githubdiffparser/ResizingParseWindow.java b/...githubdiffparser/ResizingParseWindow.java → ...githubdiffparser/ResizingParseWindow.java
diff --git a/.../stkent/githubdiffparser/models/Diff.java → .../stkent/githubdiffparser/models/Diff.java b/.../stkent/githubdiffparser/models/Diff.java → .../stkent/githubdiffparser/models/Diff.java
diff --git a/.../stkent/githubdiffparser/models/Hunk.java → .../stkent/githubdiffparser/models/Hunk.java b/.../stkent/githubdiffparser/models/Hunk.java → .../stkent/githubdiffparser/models/Hunk.java
diff --git a/.../stkent/githubdiffparser/models/Line.java → .../stkent/githubdiffparser/models/Line.java b/.../stkent/githubdiffparser/models/Line.java → .../stkent/githubdiffparser/models/Line.java
diff --git a/...stkent/githubdiffparser/models/Range.java → ...stkent/githubdiffparser/models/Range.java b/...stkent/githubdiffparser/models/Range.java → ...stkent/githubdiffparser/models/Range.java
diff --git a/plugin/src/main/resources/checkstyle.xml → gnag/src/main/resources/checkstyle.xml b/plugin/src/main/resources/checkstyle.xml → gnag/src/main/resources/checkstyle.xml
diff --git a/...in/src/main/resources/github-markdown.css → gnag/src/main/resources/github-markdown.css b/...in/src/main/resources/github-markdown.css → gnag/src/main/resources/github-markdown.css
diff --git a/plugin/src/main/resources/pmd.xml → gnag/src/main/resources/pmd.xml b/plugin/src/main/resources/pmd.xml → gnag/src/main/resources/pmd.xml
diff --git a/...s/AndroidLintViolationDetectorTest.groovy → ...s/AndroidLintViolationDetectorTest.groovy b/...s/AndroidLintViolationDetectorTest.groovy → ...s/AndroidLintViolationDetectorTest.groovy
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists