Skip to content

Commit 3a197c4

Browse files
Relocate project files to src
1 parent 5bf8083 commit 3a197c4

39 files changed

Lines changed: 16 additions & 41 deletions

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ jobs:
2626
cache: gradle
2727

2828
- name: Build and test
29-
run: ./gradlew check shadowJar
29+
run: ./gradlew build
3030

3131
- name: Upload extension JAR
3232
uses: actions/upload-artifact@v4
3333
with:
3434
name: protospector-extension
35-
path: app/build/libs/app.jar
35+
path: build/libs/protospector.jar
3636
if-no-files-found: error

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- name: Prepare release asset
3131
run: |
3232
version="${GITHUB_REF_NAME#v}"
33-
cp app/build/libs/app.jar "protospector-${version}.jar"
33+
cp build/libs/protospector.jar "protospector-${version}.jar"
3434
3535
- name: Create GitHub release
3636
uses: softprops/action-gh-release@v2

Makefile

Lines changed: 0 additions & 29 deletions
This file was deleted.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ The extension uses the Shadow plugin to bundle all dependencies (including proto
8080

8181
```
8282

83-
The built JAR will be located at: `app/build/libs/app.jar`
83+
The built JAR will be located at: `build/libs/protospector.jar`
8484

8585
### Build Details
8686

app/build.gradle renamed to build.gradle

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,13 @@ repositories {
88
mavenCentral()
99
}
1010

11+
java {
12+
toolchain {
13+
// Use Java 17 for compilation (Shadow can't process Java 21 bytecode)
14+
languageVersion = JavaLanguageVersion.of(17)
15+
}
16+
}
17+
1118
dependencies {
1219
compileOnly libs.burpMontayaApi
1320
implementation libs.protobufJava
@@ -18,14 +25,8 @@ dependencies {
1825
testRuntimeOnly libs.junitPlatformLauncher
1926
}
2027

21-
java {
22-
toolchain {
23-
// Use Java 17 for compilation (Shadow 8.1.1 can't process Java 21 bytecode)
24-
languageVersion = JavaLanguageVersion.of(17)
25-
}
26-
}
27-
2828
shadowJar {
29+
archiveBaseName.set('protospector')
2930
archiveClassifier.set('')
3031
// Relocate protobuf classes to avoid conflicts with Burp's bundled version
3132
relocate 'com.google.protobuf', 'doyensec.protospector.shaded.com.google.protobuf'
@@ -36,6 +37,10 @@ jar {
3637
dependsOn shadowJar
3738
}
3839

40+
build {
41+
dependsOn shadowJar
42+
}
43+
3944
test {
4045
useJUnitPlatform()
4146
}

settings.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,3 @@ plugins {
1111
}
1212

1313
rootProject.name = 'protospector'
14-
include('app')
File renamed without changes.

app/src/main/java/doyensec/protospector/Protospector.java renamed to src/main/java/doyensec/protospector/Protospector.java

File renamed without changes.

app/src/main/java/doyensec/protospector/editor/ProtospectorEditor.java renamed to src/main/java/doyensec/protospector/editor/ProtospectorEditor.java

File renamed without changes.

app/src/main/java/doyensec/protospector/editor/ProtospectorEditorPanel.java renamed to src/main/java/doyensec/protospector/editor/ProtospectorEditorPanel.java

File renamed without changes.

0 commit comments

Comments
 (0)