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.

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

Updates OSRS Archipelago Plugin to v1.2 #6430

Open
wants to merge 56 commits into
base: master
Choose a base branch
from
Open

Updates OSRS Archipelago Plugin to v1.2 #6430

Show file tree
Hide file tree
Changes from 48 commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
3df90e3
Create osrs-archipelago
digiholic Jul 14, 2023
80b0ee7
Update osrs-archipelago
digiholic Jul 14, 2023
ac5107d
Updated plugin to fix gradle issue
digiholic Jul 14, 2023
1122faa
Merge branch 'osrs-archipelago' of https://github.com/digiholic/plugi…
digiholic Jul 14, 2023
968eed1
Update osrs-archipelago
digiholic Jul 14, 2023
e187c60
Update osrs-archipelago
digiholic Jul 14, 2023
3412bab
Update osrs-archipelago
digiholic Jul 15, 2023
1bc9913
Update osrs-archipelago
digiholic Aug 17, 2023
e1d0f7d
Update osrs-archipelago to 0.4.1
digiholic Aug 29, 2023
606a40e
Updates OSRS Archipelago to 1.0.0
digiholic Nov 3, 2023
077f630
Update osrs-archipelago
digiholic Nov 3, 2023
1937916
Adds Library code to project instead of external dependency
digiholic Nov 13, 2023
e3662b5
OSRS-Archipelago v1.0.2
digiholic Feb 19, 2024
94c9584
Removes Deprecated WidgetInfo reference
digiholic Feb 19, 2024
948bc3c
Swaps Archipelago MultiClient Jar for one without dependencies
digiholic Mar 20, 2024
12a1f4e
Shrinks Panel Icon image to a reasonably sized PNG instead of full re…
digiholic Mar 20, 2024
888fa92
Adds Libraries removed from MultiClient that aren't provided by RuneLite
digiholic Mar 29, 2024
e43f346
Fixes broken gradle imports in plugin and in client dependency
digiholic Mar 29, 2024
e21fe05
Excludes junit bom from dependency
digiholic Mar 29, 2024
00549db
Adds third-party dependency verification for apache httpclient
digiholic Mar 29, 2024
1705ebc
Merge branch 'master' into osrs-archipelago
digiholic Mar 29, 2024
065572a
Updated to upstream, resolved merge conflict
digiholic Mar 29, 2024
5222621
Removes junit bom exclusion since it's now being verified anyway
digiholic Mar 29, 2024
bbd6f45
Adds duplicatesstrategy to build gradle
digiholic Apr 2, 2024
871a121
Duplicate Strategy was unrecognized. Trying explicit enum use
digiholic Apr 2, 2024
67257b3
Switches gradle task from Copy to Jar for duplicate handling
digiholic Apr 2, 2024
0a30cae
Removes junit-bom from apache import
digiholic Apr 2, 2024
7a06ac2
Changing third party verification to other apache library
digiholic Apr 2, 2024
a2d67ca
Merge branch 'osrs-archipelago' of https://github.com/digiholic/plugi…
digiholic Apr 2, 2024
7a8f746
Adds TestImplementation for junit bom
digiholic Apr 2, 2024
c602a29
Attempting manually entered bom module
digiholic Apr 9, 2024
70d262a
Merge branch 'osrs-archipelago' of https://github.com/digiholic/plugi…
digiholic Apr 9, 2024
e9e7967
Removes navigation button in shut down
digiholic Apr 12, 2024
2b7397b
Merge branch 'master' into osrs-archipelago
digiholic Apr 17, 2024
b3dace1
Merge branch 'master' into osrs-archipelago
digiholic Aug 12, 2024
fcee7d8
Updates OSRS Archipelago to V1.2
digiholic Aug 12, 2024
122979e
Updates OSRS Plugin commit hash
digiholic Aug 13, 2024
11d9879
Merge branch 'master' into osrs-archipelago
digiholic Aug 13, 2024
a806241
Updates dependencies of Archipelago plugin
digiholic Aug 13, 2024
bd85b59
Changes were not included somehow in previous commit. Trying again.
digiholic Aug 13, 2024
ef73c44
Removes JUnit bom
digiholic Aug 13, 2024
b57f78d
Sets httpcore to non-transitive
digiholic Aug 13, 2024
4b9b76d
Attempts to exclude junit from httpcore
digiholic Aug 13, 2024
4c1c737
Adds junit bom to exclusion list
digiholic Aug 13, 2024
8f5ad56
Fixes syntax in manual junit bom verification
digiholic Aug 13, 2024
bdc9e92
I guess bom is on 5.9.3 now
digiholic Aug 13, 2024
782acf2
Removes httpclient5 from dependencies
digiholic Aug 13, 2024
1e858ff
Moves junit bom verification to template file
digiholic Aug 13, 2024
a2faa63
Removes modules that are no longer necessary from verification metadata
digiholic Aug 13, 2024
7e9f20e
Woops, too much! Reverse course!
digiholic Aug 13, 2024
e226e5a
Looks like the websocket 1.5.7 is required after all
digiholic Aug 13, 2024
787d6d1
Removes Java IO Serialization
digiholic Oct 8, 2024
54d8bb3
Injects GSON instead of creating new instance
digiholic Oct 8, 2024
b6deff5
Merge branch 'master' into osrs-archipelago
digiholic Oct 8, 2024
fb68051
Replaces maven repository Archipelago plugin with embedded package, s…
digiholic Oct 8, 2024
0104e3f
Removes Gson constructors from APClient
digiholic Oct 8, 2024
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
3 changes: 2 additions & 1 deletion package/verification-template/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,10 @@ dependencies {
exclude group: 'org.apache.commons', module: 'commons-pool2'
}

thirdParty("org.apache.httpcomponents.core5:httpcore5:5.2") {
thirdParty("dev.koifysh:archipelago-client:0.1.19") {
because "osrs-archipelago"
}

thirdParty platform("org.lwjgl:lwjgl-bom:3.3.1") {
because "gpu-experimental"
}
Expand Down
87 changes: 79 additions & 8 deletions package/verification-template/gradle/verification-metadata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,14 @@
<sha256 value="d2b115634f5c085db4b9c9ffc2658e89e231fdbfbe2242121a1cd95d4d948dd7" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.google.code.gson" name="gson" version="2.11.0">
<artifact name="gson-2.11.0.jar">
<sha256 value="57928d6e5a6edeb2abd3770a8f95ba44dce45f3b23b7a9dc2b309c581552a78b" origin="Generated by Gradle"/>
</artifact>
<artifact name="gson-2.11.0.pom">
<sha256 value="c0e547bea998888e6e25c5886a90e762272bc88b5275343dd2c05ded6ca2e360" origin="Generated by Gradle"/>
</artifact>
</component>
digiholic marked this conversation as resolved.
Show resolved Hide resolved
<component group="com.google.code.gson" name="gson" version="2.8.5">
<artifact name="gson-2.8.5.jar">
<sha256 value="233a0149fc365c9f6edbd683cfe266b19bdc773be98eabdaf6b3c924b48e7d81" origin="Generated by Gradle"/>
Expand All @@ -266,6 +274,11 @@
<sha256 value="4248e0882426c615182385d6086c3ef3262e769957189e29306280b85482b833" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.google.code.gson" name="gson-parent" version="2.11.0">
<artifact name="gson-parent-2.11.0.pom">
<sha256 value="8acb1f3b72a6f026916ac0735bad9aab0293d527edb7b365327def13a9367b7a" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.google.code.gson" name="gson-parent" version="2.8.5">
<artifact name="gson-parent-2.8.5.pom">
<sha256 value="8f1fec72b91a71ea39ec39f5f778c4d1124b6b097c6d55b3a50b554a52237b27" origin="Generated by Gradle"/>
Expand All @@ -284,11 +297,24 @@
<sha256 value="9144127192d6f612c2366825dceaeb23b0d53130b83e0bf1ffe107d1470a8487" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.google.errorprone" name="error_prone_annotations" version="2.27.0">
<artifact name="error_prone_annotations-2.27.0.jar">
<sha256 value="24c923372c58e35d0b9f16a028929bb9aedc77521867c274f2bd0735df5ba1f5" origin="Generated by Gradle"/>
</artifact>
<artifact name="error_prone_annotations-2.27.0.pom">
<sha256 value="4ca5a35d61235e16549ac346d1e34551cdf0fe27e84aa57e03cbeb255ea4e5da" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.google.errorprone" name="error_prone_parent" version="2.0.18">
<artifact name="error_prone_parent-2.0.18.pom">
<sha256 value="cf149955279b07d4f11e817985c1164a69e930d73db7441b43a6ef53bbd286c4" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.google.errorprone" name="error_prone_parent" version="2.27.0">
<artifact name="error_prone_parent-2.27.0.pom">
<sha256 value="fa81829d049559df6927f9c9a6fd6bbd09f8b50e6d4736ae72c8300b6c3d7654" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.google.guava" name="guava" version="23.2-jre">
<artifact name="guava-23.2-jre.jar">
<sha256 value="5be9a7d05ba0ccd74708bc8018ae412255f85843c0b92302e9b9befa6ed52564" origin="Generated by Gradle"/>
Expand Down Expand Up @@ -534,6 +560,22 @@
<sha256 value="1da5fdcd12e75b62ba85eed94ab46b64ab9ad7f66a5d1cfcbe194e4e9a0f5d84" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="dev.koifysh" name="archipelago-client" version="0.1.18">
<artifact name="archipelago-client-0.1.18.jar">
<sha256 value="8ebb3dbaa85dd6edebd348151ead99b781f27fddacaef33a8d5f516c21db5ade" origin="Generated by Gradle"/>
</artifact>
<artifact name="archipelago-client-0.1.18.pom">
<sha256 value="3354696605f14bc952380651786ab3bc97a4bbd5a63d74a5973f177c18c17725" origin="Generated by Gradle"/>
</artifact>
</component>
digiholic marked this conversation as resolved.
Show resolved Hide resolved
<component group="dev.koifysh" name="archipelago-client" version="0.1.19">
<artifact name="archipelago-client-0.1.19.jar">
<sha256 value="773c164119127eaaf620bb9ff98aa923787a1b8b88804fd2000ab0aeb2764e2f" origin="Generated by Gradle"/>
</artifact>
<artifact name="archipelago-client-0.1.19.pom">
<sha256 value="6f7e38e9d1562aec8f2fedd5f8518b435528be119e94d8e1f651a19c1ee2db21" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="io.ably" name="ably-java" version="1.2.5">
<artifact name="ably-java-1.2.5.jar">
<sha256 value="4da5786a9c8ec53ed4fb3516e944960568addade884fad862f4e7d78ca57de71" origin="Generated by Gradle"/>
Expand Down Expand Up @@ -787,6 +829,14 @@
<sha256 value="107a8cb10b5ce404464eafc1f67b1c132f068310f30b86d8a4c0a44da9057f25" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.httpcomponents.core5" name="httpcore5" version="5.2.5">
<artifact name="httpcore5-5.2.5.jar">
<sha256 value="9552b9e06cef3170e37046092de115c33a7cb48ee7ef0d87f1d5650dee7e1b0d" origin="Generated by Gradle"/>
</artifact>
<artifact name="httpcore5-5.2.5.pom">
<sha256 value="1f43b165c58f32d712e294844ba44245fc7e54cdabb98537a79cedc94bef497b" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.httpcomponents.core5" name="httpcore5-h2" version="5.2">
<artifact name="httpcore5-h2-5.2.jar">
<sha256 value="5a087fb8c619979d492a83546f351ddadf32b28cc6a32923229f3fc777171578" origin="Generated by Gradle"/>
Expand All @@ -800,6 +850,11 @@
<sha256 value="d7f7efec609e0fdd7e3ae6eb3a550058e6f93e5d2c2424d74b21de8f7536f750" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.httpcomponents.core5" name="httpcore5-parent" version="5.2.5">
<artifact name="httpcore5-parent-5.2.5.pom">
<sha256 value="b6d08a9682e9dcbd6c0dc0fd913450d78d24704dc05c31e2f7c38df320d8fa88" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.checkerframework" name="checker-qual" version="3.21.2">
<artifact name="checker-qual-3.21.2.jar">
<sha256 value="7e8554c902b9b839e61396cfe3a64c84ecabfb8eb652c410bfd8e4f5c1a8ece8" origin="Generated by Gradle"/>
Expand Down Expand Up @@ -897,6 +952,14 @@
<sha256 value="e4dc76ef840014f3739e100813426ccc045b0a17e51c5038e69fdbe1f4ced434" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.java-websocket" name="Java-WebSocket" version="1.5.7">
<artifact name="Java-WebSocket-1.5.7.jar">
<sha256 value="28d8392a882660e636603c0a72d3e1ed5da1993210214645754e93655c0d806a" origin="Generated by Gradle"/>
</artifact>
<artifact name="Java-WebSocket-1.5.7.pom">
<sha256 value="16b0757548ed6e4a834293d6202a896470a145a7a4083250b4d64c960cdeb411" origin="Generated by Gradle"/>
</artifact>
</component>
digiholic marked this conversation as resolved.
Show resolved Hide resolved
<component group="org.jetbrains" name="annotations" version="23.0.0">
<artifact name="annotations-23.0.0.jar">
<sha256 value="7b0f19724082cbfcbc66e5abea2b9bc92cf08a1ea11e191933ed43801eb3cd05" origin="Generated by Gradle"/>
Expand Down Expand Up @@ -950,6 +1013,14 @@
<sha256 value="b163c1cfc8fc1fd58b457a00d586c04c46e986d75904e9ca54c03a97d65b496c" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.junit" name="junit-bom" version="5.9.3">
<artifact name="junit-bom-5.9.3.pom">
<sha256 value="4d0329cd9e72f2420e5ca15724cbfe6ffa6e5fd2888361516271190fdc342ed7" origin="Generated by Gradle"/>
</artifact>
<artifact name="junit-bom-5.9.3.module">
<sha256 value="b401fd25901e582a524aa5343c4b39e28bc56e24961c1069bf2b4bbfcee46b93" origin="Manually entered"/>
</artifact>
</component>
<component group="org.lwjgl" name="lwjgl" version="3.3.1">
<artifact name="lwjgl-3.3.1-natives-linux.jar">
<sha256 value="22ef2afa31a1740a337ec9c6806c6b8d97e931a63e2c43270cbaf14fb3f6fc4e" origin="Generated by Gradle"/>
Expand Down Expand Up @@ -1211,6 +1282,14 @@
<sha256 value="1393089af1f9260c004c22313197cae9db1385ccbb30499a82d5a931d1762f66" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.xerial" name="sqlite-jdbc" version="3.46.0.0">
<artifact name="sqlite-jdbc-3.46.0.0.jar">
<sha256 value="e697df15be3f95219d80773c5f1002030e33e932adda186c1c86fd51df6691a9" origin="Generated by Gradle"/>
</artifact>
<artifact name="sqlite-jdbc-3.46.0.0.pom">
<sha256 value="3c16325e9917957ada3cda84fb50296145aa4f3aa73e7a5d63af9719cee2a7ac" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.zeromq" name="jnacl" version="0.1.0">
<artifact name="jnacl-0.1.0.jar">
<sha256 value="5e4836d5f08a22e833f9cf1cadbdb5af60c0735d08dd88256a04d5df25b54f26" origin="Generated by Gradle"/>
Expand All @@ -1227,13 +1306,5 @@
<sha256 value="dde987354153b7df4d4247472dc8edb1341c6382e7570986a146320826c54621" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.xerial" name="sqlite-jdbc" version="3.46.0.0">
<artifact name="sqlite-jdbc-3.46.0.0.jar">
<sha256 value="e697df15be3f95219d80773c5f1002030e33e932adda186c1c86fd51df6691a9" origin="Generated by Gradle"/>
</artifact>
<artifact name="sqlite-jdbc-3.46.0.0.pom">
<sha256 value="3c16325e9917957ada3cda84fb50296145aa4f3aa73e7a5d63af9719cee2a7ac" origin="Generated by Gradle"/>
</artifact>
</component>
</components>
</verification-metadata>
2 changes: 1 addition & 1 deletion plugins/osrs-archipelago
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
repository=https://github.com/digiholic/osrs-archipelago.git
commit=18d04a9b8dbd3f925176366f19b4077bcf7402a5
commit=34a7bacdda632ae961998562a3982647de17fd5d
Loading