Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Publish action package rename #232

Merged
merged 2 commits into from
Jul 3, 2024
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
4 changes: 4 additions & 0 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ jobs:
gpg --pinentry-mode=loopback --yes --passphrase "${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}" --keyring secring.gpg --export-secret-keys > /home/runner/.gnupg/secring.gpg
- name: Validate Gradle wrapper
uses: gradle/wrapper-validation-action@ccb4328a959376b642e027874838f60f8e596de3
- name: Package Renames
uses: gradle/gradle-build-action@749f47bda3e44aa060e82d7b3ef7e40d953bd629
with:
arguments: packageRename
- name: Publish package
uses: gradle/gradle-build-action@749f47bda3e44aa060e82d7b3ef7e40d953bd629
with:
Expand Down
10 changes: 8 additions & 2 deletions demo-multi-app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,14 @@ sourceSets.test.java.srcDirs = ['test']
sourceSets.main.resources.srcDirs = ['resources']

dependencies {
implementation project(':docking-ui')
implementation project(':docking-multi-app')
if (project.hasProperty("useMavenVersion")) {
implementation 'io.github.andrewauclair:modern-docking-ui:' + version
implementation 'io.github.andrewauclair:modern-docking-multi-app:' + version
}
else {
implementation project(':docking-ui')
implementation project(':docking-multi-app')
}

implementation 'com.formdev:flatlaf:3.4.1'
implementation 'com.formdev:flatlaf-extras:3.4.1'
Expand Down
10 changes: 8 additions & 2 deletions demo-single-app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,14 @@ sourceSets.test.java.srcDirs = ['test']
sourceSets.main.resources.srcDirs = ['resources']

dependencies {
implementation project(':docking-ui')
implementation project(':docking-single-app')
if (project.hasProperty("useMavenVersion")) {
implementation 'io.github.andrewauclair:modern-docking-ui:' + version
implementation 'io.github.andrewauclair:modern-docking-single-app:' + version
}
else {
implementation project(':docking-ui')
implementation project(':docking-single-app')
}

implementation 'com.formdev:flatlaf:3.4.1'
implementation 'com.formdev:flatlaf-extras:3.4.1'
Expand Down
10 changes: 0 additions & 10 deletions docking-api/src/module-info.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,6 @@
exports ModernDocking.ui;
exports ModernDocking.api;

exports io.github.andrewauclair.moderndocking;
exports io.github.andrewauclair.moderndocking.event;
exports io.github.andrewauclair.moderndocking.exception;
exports io.github.andrewauclair.moderndocking.layouts;
exports io.github.andrewauclair.moderndocking.persist;
exports io.github.andrewauclair.moderndocking.settings;
exports io.github.andrewauclair.moderndocking.ui;
exports io.github.andrewauclair.moderndocking.api;

// export our internal package only to our other extension modules
exports ModernDocking.internal to modern_docking.ui_ext, modern_docking.single_app, modern_docking.multi_app;
exports io.github.andrewauclair.moderndocking.internal to modern_docking.ui_ext, modern_docking.single_app, modern_docking.multi_app;
}
7 changes: 6 additions & 1 deletion docking-multi-app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,12 @@ base {

// NOTE: do not add new dependencies here, Modern Docking is a zero-dependency library
dependencies {
api project(':docking-api')
if (project.hasProperty("useMavenVersion")) {
implementation 'io.github.andrewauclair:modern-docking-api:' + version
}
else {
api project(':docking-api')
}
}

java {
Expand Down
7 changes: 6 additions & 1 deletion docking-single-app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,12 @@ base {

// NOTE: do not add new dependencies here, Modern Docking is a zero-dependency library
dependencies {
api project(':docking-api')
if (project.hasProperty("useMavenVersion")) {
implementation 'io.github.andrewauclair:modern-docking-api:' + version
}
else {
api project(':docking-api')
}
}

java {
Expand Down
7 changes: 6 additions & 1 deletion docking-ui/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,12 @@ base {
}

dependencies {
api project(':docking-api')
if (project.hasProperty("useMavenVersion")) {
implementation 'io.github.andrewauclair:modern-docking-api:' + version
}
else {
api project(':docking-api')
}

implementation 'com.formdev:flatlaf:3.4.1'
implementation 'com.formdev:flatlaf-extras:3.4.1'
Expand Down
29 changes: 29 additions & 0 deletions package-renamer/docking-api-module-info.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
/**
* Module for the Modern Docking framework
*/
module modern_docking.api {
requires java.desktop;
requires java.logging;

exports ModernDocking;
exports ModernDocking.event;
exports ModernDocking.exception;
exports ModernDocking.layouts;
exports ModernDocking.persist;
exports ModernDocking.settings;
exports ModernDocking.ui;
exports ModernDocking.api;

exports io.github.andrewauclair.moderndocking;
exports io.github.andrewauclair.moderndocking.event;
exports io.github.andrewauclair.moderndocking.exception;
exports io.github.andrewauclair.moderndocking.layouts;
exports io.github.andrewauclair.moderndocking.persist;
exports io.github.andrewauclair.moderndocking.settings;
exports io.github.andrewauclair.moderndocking.ui;
exports io.github.andrewauclair.moderndocking.api;

// export our internal package only to our other extension modules
exports ModernDocking.internal to modern_docking.ui_ext, modern_docking.single_app, modern_docking.multi_app;
exports io.github.andrewauclair.moderndocking.internal to modern_docking.ui_ext, modern_docking.single_app, modern_docking.multi_app;
}
10 changes: 10 additions & 0 deletions package-renamer/docking-multi-app-module-info.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
/**
* Module for the Modern Docking framework
*/
module modern_docking.multi_app {
requires modern_docking.api;
requires java.desktop;

exports ModernDocking.app;
exports io.github.andrewauclair.moderndocking.app;
}
10 changes: 10 additions & 0 deletions package-renamer/docking-single-app-module-info.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
/**
* Module for the Modern Docking framework
*/
module modern_docking.single_app {
requires modern_docking.api;
requires java.desktop;

exports ModernDocking.app;
exports io.github.andrewauclair.moderndocking.app;
}
11 changes: 11 additions & 0 deletions package-renamer/docking-ui-module-info.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
/**
* Module for the Modern Docking framework
*/
module modern_docking.ui_ext {
requires modern_docking.api;
requires java.desktop;
requires com.formdev.flatlaf.extras;

exports ModernDocking.ext.ui;
exports io.github.andrewauclair.moderndocking.ext.ui;
}
5 changes: 5 additions & 0 deletions package-renamer/src/Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -141,5 +141,10 @@ public static void main(String[] args) throws IOException {
renameFolders(new File("docking-single-app/src"));
renameFolders(new File("docking-multi-app/src"));
renameFolders(new File("docking-ui/src"));

FileUtils.copyFile(new File("package-renamer/docking-api-module-info.java"), new File("docking-api/src/module-info.java"));
FileUtils.copyFile(new File("package-renamer/docking-ui-module-info.java"), new File("docking-ui/src/module-info.java"));
FileUtils.copyFile(new File("package-renamer/docking-single-app-module-info.java"), new File("docking-single-app/src/module-info.java"));
FileUtils.copyFile(new File("package-renamer/docking-multi-app-module-info.java"), new File("docking-multi-app/src/module-info.java"));
}
}
Loading