Merge pull request #77 from shipkit/sf

Renamed packages for consistency
shipkit · Jan 5, 2021 · 8d8db6c · 8d8db6c
2 parents ab1bf58 + 213b04e
commit 8d8db6c
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -234,7 +234,7 @@ Complete task configuration
 ### 'org.shipkit.shipkit-github-release'
 
 Basic task configuration
-(source: [GithubReleasePluginIntegTest](https://github.com/shipkit/shipkit-changelog/blob/master/src/integTest/groovy/org/shipkit/gh/release/GithubReleasePluginIntegTest.groovy))
+(source: [GithubReleasePluginIntegTest](https://github.com/shipkit/shipkit-changelog/blob/master/src/integTest/groovy/org/shipkit/github/release/GithubReleasePluginIntegTest.groovy))
 
 ```groovy
     plugins {
@@ -250,7 +250,7 @@ Basic task configuration
 ```
 
 Complete task configuration
-(source: [GithubReleasePluginIntegTest](https://github.com/shipkit/shipkit-changelog/blob/master/src/integTest/groovy/org/shipkit/gh/release/GithubReleasePluginIntegTest.groovy))
+(source: [GithubReleasePluginIntegTest](https://github.com/shipkit/shipkit-changelog/blob/master/src/integTest/groovy/org/shipkit/github/release/GithubReleasePluginIntegTest.groovy))
 
 ```groovy
     plugins {

diff --git a/gradle/release.gradle b/gradle/release.gradle
@@ -8,11 +8,11 @@ gradlePlugin {
         githubReleaseDeprecated {
             //TODO please remove deprecated plugin after we complete the rename, see #65
             id = 'org.shipkit.shipkit-gh-release'
-            implementationClass = 'org.shipkit.gh.release.GithubReleasePlugin'
+            implementationClass = 'org.shipkit.github.release.GithubReleasePlugin'
         }
         githubRelease {
             id = 'org.shipkit.shipkit-github-release'
-            implementationClass = 'org.shipkit.gh.release.GithubReleasePlugin'
+            implementationClass = 'org.shipkit.github.release.GithubReleasePlugin'
         }
     }
 }

diff --git a/src/integTest/groovy/org/shipkit/gh/release/GithubReleasePluginIntegTest.groovy b/src/integTest/groovy/org/shipkit/gh/release/GithubReleasePluginIntegTest.groovy
@@ -1,4 +1,4 @@
-package org.shipkit.gh.release
+package org.shipkit.github.release
 
 
 import org.junit.Rule

diff --git a/src/main/java/org/shipkit/changelog/GenerateChangelogTask.java b/src/main/java/org/shipkit/changelog/GenerateChangelogTask.java
@@ -5,6 +5,7 @@
 import org.gradle.api.logging.Logging;
 import org.gradle.api.tasks.Optional;
 import org.gradle.api.tasks.*;
+import org.shipkit.github.release.GithubReleaseTask;
 
 import java.io.File;
 import java.util.*;
@@ -159,7 +160,7 @@ public String getGithubToken() {
     /**
      * Github token used to pull Github issues.
      * The same token is used to post a new release:
-     * {@link org.shipkit.gh.release.GithubReleaseTask#setGithubToken(String)}
+     * {@link GithubReleaseTask#setGithubToken(String)}
      */
     public void setGithubToken(String githubToken) {
         this.githubToken = githubToken;

diff --git a/...ipkit/gh/release/GithubReleasePlugin.java → ...t/github/release/GithubReleasePlugin.java b/...ipkit/gh/release/GithubReleasePlugin.java → ...t/github/release/GithubReleasePlugin.java
@@ -1,4 +1,4 @@
-package org.shipkit.gh.release;
+package org.shipkit.github.release;
 
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;

diff --git a/...shipkit/gh/release/GithubReleaseTask.java → ...kit/github/release/GithubReleaseTask.java b/...shipkit/gh/release/GithubReleaseTask.java → ...kit/github/release/GithubReleaseTask.java
@@ -1,4 +1,4 @@
-package org.shipkit.gh.release;
+package org.shipkit.github.release;
 
 import com.eclipsesource.json.Json;
 import com.eclipsesource.json.JsonObject;