From 0cf413c0e5bf7dd1eba15884be329e74f3e1a13a Mon Sep 17 00:00:00 2001
From: johni0702 <me@johni0702.de>
Date: Wed, 14 Sep 2016 18:31:53 +0200
Subject: [PATCH] Update ReplayStudio to use the preshadowed netty version
 Directly include jGui source files to avoid classpath issues

---
 ReplayStudio    | 2 +-
 build.gradle    | 9 ++++++++-
 settings.gradle | 1 -
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ReplayStudio b/ReplayStudio
index 726cbf4f..f98b781f 160000
--- a/ReplayStudio
+++ b/ReplayStudio
@@ -1 +1 @@
-Subproject commit 726cbf4f4176cea203f99619e50d64bdffeab156
+Subproject commit f98b781f3053696fbc0496115c5a1c45a10ace49
diff --git a/build.gradle b/build.gradle
index d561e12f..de592872 100755
--- a/build.gradle
+++ b/build.gradle
@@ -67,12 +67,13 @@ dependencies {
 
     shade 'org.aspectj:aspectjrt:1.8.2'
 
-    shade project(':jGui')
     compile project(':ReplayStudio')
 
     testCompile 'junit:junit:4.11'
 }
 
+tasks['idea'].dependsOn ':ReplayStudio:preshadowJar'
+
 jar {
     duplicatesStrategy = DuplicatesStrategy.EXCLUDE
 
@@ -172,6 +173,12 @@ processResources
 
 sourceSets {
     main {
+        // Directly include jGui into main build
+        // This could also be done by including it as a gradle subproject, however
+        // doing so caused classpath issues on some IntelliJ versions.
+        java {
+            srcDir 'jGui/src/main/java'
+        }
         resources {
             srcDir 'jGui/src/main/resources'
         }
diff --git a/settings.gradle b/settings.gradle
index 5377ffe9..28830758 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,2 +1 @@
-include 'jGui'
 include 'ReplayStudio'
\ No newline at end of file