From 221991bf2c1f19534f3a6481c02f9149412ffd56 Mon Sep 17 00:00:00 2001 From: Jonas Herzig Date: Thu, 15 Mar 2018 21:56:46 +0100 Subject: [PATCH] Do not shade gson lib (fixes #115) The gson lib is provided by MC anyway. Additionally, by shading it, we relocate the lib via the FG reobfJar task which doesn't properly handle annotations causing the Mixin lib's MixinConfig to no longer parse properly. --- gradle/reprod/checksums.txt | 32 ++++++++++++++++---------------- versions/common.gradle | 4 +++- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/gradle/reprod/checksums.txt b/gradle/reprod/checksums.txt index 1deeb35c..8cc26694 100644 --- a/gradle/reprod/checksums.txt +++ b/gradle/reprod/checksums.txt @@ -26,22 +26,22 @@ f539e2ca00d43e3d2261b7334eb05137f0eb1d3d5e3cc2c2716b0071e27783ed /com/github/Min fe525f413965d4f5f65b70f08b90b3d3f944714f665e2c5636a6e8fec08d3c74 /com/github/MinecraftForge/Srg2Source/ea4ea62/Srg2Source-ea4ea62.pom ecf57aab63509ec0ce3937c2215bc3a2e3cb6357cd11095978db18bd3251731a /com/github/ModCoderPack/MCInjector/7258466/MCInjector-7258466.jar dc7ed1f4f0ddd8f5ce3b449db944907a5eb2855dbbbc59b08dad1247ebafba33 /com/github/ModCoderPack/MCInjector/7258466/MCInjector-7258466.pom -70429d88b6f4705ce385491500afa126e936447f992c7d4221d0751e8f0f7c50 /com/github/ReplayMod/ReplayStudio/1.10.2/e6f898d/1.10.2-e6f898d.pom -4d7e34aa0ca77482fb2d4c6617ac556e1c0dfcb1be1e651578200d7198ee3cfc /com/github/ReplayMod/ReplayStudio/1.10.2/e6f898d/1.10.2-e6f898d.jar -c449a20fa5c6365d7c16c3fc3b81fa5f260becc962075d1c02c5a998e4c1c36f /com/github/ReplayMod/ReplayStudio/1.11.2/e6f898d/1.11.2-e6f898d.pom -3feaeb7ddfc841318f842dbd850aff858222ad4abca31ddfffa8c5c2f8c0ae67 /com/github/ReplayMod/ReplayStudio/1.11.2/e6f898d/1.11.2-e6f898d.jar -d55fffd172e435aff8cb31338a7dea43cc7b19eb0af074de0faefad4864f5493 /com/github/ReplayMod/ReplayStudio/1.11/e6f898d/1.11-e6f898d.pom -7fb4e0b0e8e4c0cada73c7091064d50131dfaadf257619f10f391fb8ed341f3c /com/github/ReplayMod/ReplayStudio/1.11/e6f898d/1.11-e6f898d.jar -b758ff30bfc9297a9c13d5ca607fc9096a43682a46951d9ad1cefa5400e4d5fe /com/github/ReplayMod/ReplayStudio/1.12.1/e6f898d/1.12.1-e6f898d.pom -08690338d01adc76e1bbee5077e7f9ab8efa68c78c28b03fafd453ced2528bfe /com/github/ReplayMod/ReplayStudio/1.12.1/e6f898d/1.12.1-e6f898d.jar -561716bffe975418b7bf2067621d931dbd685e9f961d5ce40d1f8841d84570a3 /com/github/ReplayMod/ReplayStudio/1.12.2/e6f898d/1.12.2-e6f898d.pom -0c4e0f20a09925b529795aef86192d90dc94360eefd6b49e7f38d74930e2b7f6 /com/github/ReplayMod/ReplayStudio/1.12.2/e6f898d/1.12.2-e6f898d.jar -b5ccd97d108791fc24627e056116ca05f9e47bfa8a9f1ba4e9d0d730a91460aa /com/github/ReplayMod/ReplayStudio/1.12/e6f898d/1.12-e6f898d.pom -b2126228c5e49c8ed1d7c9da5a59280bfd63c24b0507ee34097c64ee31837ee1 /com/github/ReplayMod/ReplayStudio/1.12/e6f898d/1.12-e6f898d.jar -21cd9c0581ddedd4e7bb2dda9db82b56c2ff5b2b9e71859803fa892fec459fcb /com/github/ReplayMod/ReplayStudio/1.8/e6f898d/1.8-e6f898d.pom -44046515c61f1d2ae73cf37949b460b2e48dfdb70bfcef0c0a09e3a5ad0e8ab9 /com/github/ReplayMod/ReplayStudio/1.8/e6f898d/1.8-e6f898d.jar -481c532b43ddfcb7c9025abf37d2e502935e2343a08c496b029e12826d682de8 /com/github/ReplayMod/ReplayStudio/1.9.4/e6f898d/1.9.4-e6f898d.pom -f2090b2bd7acdff598ef53f1a997572d774752dc6115f176bbe925026d5ac0ab /com/github/ReplayMod/ReplayStudio/1.9.4/e6f898d/1.9.4-e6f898d.jar +5a3ec92e5507df0c39475a7162104bdaebf9846b3ff057bc8beb62b0e600a58b /com/github/ReplayMod/ReplayStudio/1.10.2/6cfc69b/1.10.2-6cfc69b.pom +1e464084d1471e7b11994a62f5b837e8e2d0d2786481c6c63b26c1d91820dd0d /com/github/ReplayMod/ReplayStudio/1.10.2/6cfc69b/1.10.2-6cfc69b.jar +cdae4a16367dd0f6c921e45364fd8a4bc6b8b864a690d30acd97ec5138c4259c /com/github/ReplayMod/ReplayStudio/1.11.2/6cfc69b/1.11.2-6cfc69b.pom +a155ed9db00891c34c4c5032b90f1b959cc3b9beeea1dcbb54c5125ee29cf0a8 /com/github/ReplayMod/ReplayStudio/1.11.2/6cfc69b/1.11.2-6cfc69b.jar +a9d2c26ec4a56ab6714d7887504fffb71b728af91809a2c20b31be0d08e94dc5 /com/github/ReplayMod/ReplayStudio/1.11/6cfc69b/1.11-6cfc69b.pom +49b230872bf25d3568f90bab46a786f58d8c8f9044255f37c53e65b19a321ca0 /com/github/ReplayMod/ReplayStudio/1.11/6cfc69b/1.11-6cfc69b.jar +6acdb31e12dbe3df1e339ca2622484f67f7cd7d7ae55210612f17d028aa4114f /com/github/ReplayMod/ReplayStudio/1.12.2/6cfc69b/1.12.2-6cfc69b.pom +2beee4b8946d787f228ad3a9c2c6fdd9243f0972406d3bbb182b7929c6291170 /com/github/ReplayMod/ReplayStudio/1.12.2/6cfc69b/1.12.2-6cfc69b.jar +2abd042a4465d3efeb636181c66ab58fa8b4165818d80f59f322e06efc69e386 /com/github/ReplayMod/ReplayStudio/1.12.1/6cfc69b/1.12.1-6cfc69b.pom +add89b61bbfd24a2eccffadfa6b5293d8fbb9dd0bde2bc332553208b57faf461 /com/github/ReplayMod/ReplayStudio/1.12.1/6cfc69b/1.12.1-6cfc69b.jar +0dd0ea826dd559d151ffa6d78f90c88fd0b69062f9f34610283144d8bef75f6d /com/github/ReplayMod/ReplayStudio/1.12/6cfc69b/1.12-6cfc69b.pom +d5761025f4ff975753f4f5ae044fb0bba3a0d2e85ac4698c123f3bd80d88bbc5 /com/github/ReplayMod/ReplayStudio/1.12/6cfc69b/1.12-6cfc69b.jar +479a762a47c1bcdaf44586594793b2d6a8f4d12b784826373ab80f52f01b3a24 /com/github/ReplayMod/ReplayStudio/1.8/6cfc69b/1.8-6cfc69b.pom +cd5b202b4f9857147d4a1c5ead57242dccc10daee7895aeeead4155046f307f9 /com/github/ReplayMod/ReplayStudio/1.8/6cfc69b/1.8-6cfc69b.jar +c1e24a8d5dbf77c5f1d0e3d1604a752951ef7036979e4023bbfc7eb08e6e877b /com/github/ReplayMod/ReplayStudio/1.9.4/6cfc69b/1.9.4-6cfc69b.pom +6f734a6825344b818c2d0774410e27e57904c29974a2f8919c4e98e1bdcb82a0 /com/github/ReplayMod/ReplayStudio/1.9.4/6cfc69b/1.9.4-6cfc69b.jar bfdcda4cbf23f28392384818a1417c2d6df687e15ce77530ef96381393102f8a /com/github/SpongePowered/MixinGradle/dcfaf61/MixinGradle-dcfaf61.jar 3552e0c04817d91d1b6671a051d0e1d952c8b6a8eec57b54e829de9fa3ddf002 /com/github/SpongePowered/MixinGradle/dcfaf61/MixinGradle-dcfaf61.pom c6ebd74cd6108b8c372c95b842725ee5bd6d3303ba26cb00f18bc92f80b47956 /com/github/tony19/named-regexp/0.2.3/named-regexp-0.2.3.jar diff --git a/versions/common.gradle b/versions/common.gradle index 8b008d84..bfd388e6 100644 --- a/versions/common.gradle +++ b/versions/common.gradle @@ -61,6 +61,8 @@ if (System.getenv('REPRODUCIBLE_BUILD') == '1') repositories.all convertRepoToHt configurations { shade compile.extendsFrom shade + + shade.exclude group: 'com.google.code.gson', module: 'gson' // provided by MC } dependencies { @@ -79,7 +81,7 @@ dependencies { def studioVersion = project.name if (studioVersion == '1.8.9') studioVersion = '1.8' - shade("com.github.ReplayMod.ReplayStudio:$studioVersion:e6f898d"){ + shade("com.github.ReplayMod.ReplayStudio:$studioVersion:6cfc69b"){ exclude group: 'com.google.guava', module: 'guava' // provided by MC exclude group: 'org.projectlombok', module: 'lombok' // runtime only for @SneakyThrows which isn't used }