Skip to content

Automatic-Module-Names in Manifest and META-INF/versions module-info for hmc-lwjgl #291

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.

Sign up for GitHub

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

Merged
3arthqu4ke merged 2 commits into from
May 15, 2025
Merged

Automatic-Module-Names in Manifest and META-INF/versions module-info for hmc-lwjgl #291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
73ce879
Automatic-Module-Names in Manifest and META-INF/versions module-info …
3arthqu4ke May 15, 2025
e186f55
Fixed CI for CheerpJ web page
3arthqu4ke May 15, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/lifecycle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ jobs:
run: mv headlessmc-web/build/libs/headlessmc-web-*.jar headlessmc-web/build/libs/headlessmc-web.jar
- name: Copy Web jar
if: github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/main')
run: cp headlessmc-web/build/libs/headlessmc-web.jar _site/cheerpj/
run: cp headlessmc-web/build/libs/headlessmc-web.jar _site/cheerpj
- name: Copy web page files
if: github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/main')
run: cp -a headlessmc-web/page/. _site/cheerpj/
Expand Down
14 changes: 14 additions & 0 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,20 @@ allprojects {

jar {
archiveClassifier.set('dev')
manifest {
attributes(
"Implementation-Title": project.name,
"Implementation-Version": version,
)
}

if (project != project(':headlessmc-lwjgl')) {
manifest {
attributes(
"Automatic-Module-Name": "io.github.headlesshq.${project.name.replace("launcher-", "").replace('-', '.')}"
)
}
}
}

shadowJar {
Expand Down
9 changes: 8 additions & 1 deletion headlessmc-lwjgl/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,15 @@ repositories {
}

module {
name = 'headlessmc.lwjgl'
name = 'io.github.headlesshq.headlessmc.lwjgl'
access = ACC_OPEN
directory = project.layout.buildDirectory.dir('resources/main/META-INF/versions/9')

exports 'io/github/headlesshq/headlessmc/lwjgl'
exports 'io/github/headlesshq/headlessmc/lwjgl/api'
exports 'io/github/headlesshq/headlessmc/lwjgl/transformer'
exports 'io/github/headlesshq/headlessmc/lwjgl/redirections'
exports 'io/github/headlesshq/headlessmc/lwjgl/redirections/stb'
exports 'io/github/headlesshq/headlessmc/lwjgl/util'
exports 'io/github/headlesshq/headlessmc/lwjgl/agent'

Expand Down Expand Up @@ -65,6 +67,11 @@ jar {
}
}

shadowJar {
include("META-INF/versions/9/module-info.class")
exclude("module-info.class") // exclude asm module-info.class
}

// https://github.com/3arthqu4ke/headlessmc/issues/199
// fabric 0.16.2+ doesn't like multiple asm versions in the classpath
tasks.register('noAsmJar', Copy) {
Expand Down
Loading