File tree Expand file tree Collapse file tree 3 files changed +24
-10
lines changed Expand file tree Collapse file tree 3 files changed +24
-10
lines changed Original file line number Diff line number Diff line change @@ -17,22 +17,15 @@ cd armeria
1717# Apply patch to remove unsafe access
1818git apply " ${SCRIPT_DIR} /unsafe.patch"
1919
20- # Build the core module
21- ./gradlew :core:jar -x javadoc -x :docs-client:nodeSetup -x :docs-client:npmSetup -x :docs-client:npmInstall -x :docs-client:eslint -x :docs-client:lint -x :docs-client:buildWeb -x :docs-client:copyWeb
22-
23- # Find the built JAR
24- CORE_JAR=" core/build/libs/armeria-${VERSION} .jar"
25- if [ ! -f " $CORE_JAR " ]; then
26- echo " Error: Could not find armeria JAR at $CORE_JAR "
27- exit 1
28- fi
20+ # Build the core module (shaded JAR includes all dependencies)
21+ ./gradlew :core:shadedJar -x javadoc -x :docs-client:nodeSetup -x :docs-client:npmSetup -x :docs-client:npmInstall -x :docs-client:eslint -x :docs-client:lint -x :docs-client:buildWeb -x :docs-client:copyWeb
2922
3023# Download the original POM file
3124curl -sL -o " armeria-${VERSION} .pom" " https://repo1.maven.org/maven2/com/linecorp/armeria/armeria/${VERSION} /armeria-${VERSION} .pom"
3225
3326# Install core JAR to Maven local repository with POM
3427mvn install:install-file -q \
35- -Dfile=" $CORE_JAR " \
28+ -Dfile=" core/build/libs/armeria-untrimmed- ${VERSION} .jar " \
3629 -DpomFile=" armeria-${VERSION} .pom"
3730
3831echo " armeria ${VERSION} built and installed (UNSAFE disabled)."
Original file line number Diff line number Diff line change 1+ #! /bin/bash
2+ set -e
3+
4+ echo " Updating LMAX Disruptor version in opencensus-shim..."
5+
6+ # Add Java 11 compile target and disruptor version update to opencensus-shim build file
7+ cat >> opencensus-shim/build.gradle.kts << 'EOF '
8+
9+ tasks.withType<JavaCompile>().configureEach {
10+ options.release.set(11)
11+ }
12+
13+ configurations.all {
14+ resolutionStrategy.force("com.lmax:disruptor:4.0.0")
15+ }
16+ EOF
17+
18+ echo " LMAX Disruptor updated to version 4.0.0 with Java 11 compile target."
Original file line number Diff line number Diff line change 4545 - name : Build custom armeria without unsafe
4646 run : ./.github/unsafe/build-custom-armeria.sh
4747
48+ - name : Update LMAX Disruptor version
49+ run : ./.github/unsafe/update-lmax-disruptor.sh
50+
4851 - name : Prioritize Maven local repository
4952 run : ./.github/unsafe/prioritize-maven-local.sh
5053
You can’t perform that action at this time.
0 commit comments