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

Dendency Cycles removed #40

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

Dendency Cycles removed #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
0bd816a
chore: kleines Refactoring
Blackwolf155 Mar 30, 2022
ed8cf05
feat: Dependencies aufgelöst und Module angepasst
Blackwolf155 Apr 4, 2022
8f5ce2e
Merge branch 'master' into bennys-changes
Blackwolf155 Apr 4, 2022
1c26ed1
feat: deleted unnecessary modules
Blackwolf155 Apr 4, 2022
9fc59ea
chore: moved Color back to common
Blackwolf155 Apr 4, 2022
a23b88a
feat: Removed module shared and reverted changed dependencies
Blackwolf155 Apr 4, 2022
7b6cfb4
feat: reverted some of the changes, that were not necessary
Blackwolf155 Apr 5, 2022
4a0c85d
feat: Test umgezogen
Blackwolf155 Apr 5, 2022
b83ae4f
commit
Blackwolf155 Apr 5, 2022
d8b70e7
Merge pull request #2 from Blackwolf155/bennys-changes
Blackwolf155 Apr 5, 2022
00c7490
gradle files changed to build the dependency hierarchy correctly
Blackwolf155 Apr 5, 2022
61e4e5e
Reverted unnecessary import changes
Blackwolf155 Apr 11, 2022
628bb4f
Networktimer reverted
Blackwolf155 Apr 11, 2022
e5bd56c
Merge branch 'paulwedeck:master' into master
Blackwolf155 Apr 11, 2022
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
254 changes: 254 additions & 0 deletions ProjectStructure.uxf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,254 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<diagram program="umlet" version="14.3.0">
<zoom_level>10</zoom_level>
<element>
<id>UMLClass</id>
<coordinates>
<x>420</x>
<y>290</y>
<w>160</w>
<h>30</h>
</coordinates>
<panel_attributes>Common</panel_attributes>
<additional_attributes/>
</element>
<element>
<id>Relation</id>
<coordinates>
<x>290</x>
<y>310</y>
<w>160</w>
<h>140</h>
</coordinates>
<panel_attributes>lt=&lt;&lt;&lt;-</panel_attributes>
<additional_attributes>140.0;10.0;140.0;40.0;10.0;40.0;10.0;120.0</additional_attributes>
</element>
<element>
<id>UMLClass</id>
<coordinates>
<x>450</x>
<y>200</y>
<w>120</w>
<h>30</h>
</coordinates>
<panel_attributes>go.graphics</panel_attributes>
<additional_attributes/>
</element>
<element>
<id>UMLClass</id>
<coordinates>
<x>480</x>
<y>430</y>
<w>120</w>
<h>30</h>
</coordinates>
<panel_attributes>jsettlers.graphic</panel_attributes>
<additional_attributes/>
</element>
<element>
<id>UMLClass</id>
<coordinates>
<x>320</x>
<y>370</y>
<w>100</w>
<h>30</h>
</coordinates>
<panel_attributes>Network</panel_attributes>
<additional_attributes/>
</element>
<element>
<id>UMLClass</id>
<coordinates>
<x>370</x>
<y>430</y>
<w>100</w>
<h>30</h>
</coordinates>
<panel_attributes>Logic</panel_attributes>
<additional_attributes/>
</element>
<element>
<id>Relation</id>
<coordinates>
<x>370</x>
<y>390</y>
<w>30</w>
<h>60</h>
</coordinates>
<panel_attributes>lt=&lt;&lt;&lt;-</panel_attributes>
<additional_attributes>10.0;10.0;10.0;40.0</additional_attributes>
</element>
<element>
<id>Relation</id>
<coordinates>
<x>450</x>
<y>310</y>
<w>30</w>
<h>140</h>
</coordinates>
<panel_attributes>lt=&lt;&lt;&lt;-</panel_attributes>
<additional_attributes>10.0;10.0;10.0;120.0</additional_attributes>
</element>
<element>
<id>UMLClass</id>
<coordinates>
<x>440</x>
<y>510</y>
<w>110</w>
<h>30</h>
</coordinates>
<panel_attributes>Main</panel_attributes>
<additional_attributes/>
</element>
<element>
<id>UMLClass</id>
<coordinates>
<x>410</x>
<y>580</y>
<w>80</w>
<h>30</h>
</coordinates>
<panel_attributes>MapCreator</panel_attributes>
<additional_attributes/>
</element>
<element>
<id>Relation</id>
<coordinates>
<x>470</x>
<y>220</y>
<w>30</w>
<h>90</h>
</coordinates>
<panel_attributes>lt=&lt;&lt;&lt;-</panel_attributes>
<additional_attributes>10.0;10.0;10.0;70.0</additional_attributes>
</element>
<element>
<id>UMLClass</id>
<coordinates>
<x>250</x>
<y>430</y>
<w>100</w>
<h>30</h>
</coordinates>
<panel_attributes>LayoutBuilder</panel_attributes>
<additional_attributes/>
</element>
<element>
<id>Relation</id>
<coordinates>
<x>530</x>
<y>310</y>
<w>30</w>
<h>140</h>
</coordinates>
<panel_attributes>lt=&lt;&lt;&lt;-</panel_attributes>
<additional_attributes>10.0;10.0;10.0;120.0</additional_attributes>
</element>
<element>
<id>UMLClass</id>
<coordinates>
<x>500</x>
<y>580</y>
<w>80</w>
<h>30</h>
</coordinates>
<panel_attributes>Tools</panel_attributes>
<additional_attributes/>
</element>
<element>
<id>UMLClass</id>
<coordinates>
<x>610</x>
<y>430</y>
<w>140</w>
<h>30</h>
</coordinates>
<panel_attributes>go.graphics.swing</panel_attributes>
<additional_attributes/>
</element>
<element>
<id>Relation</id>
<coordinates>
<x>530</x>
<y>220</y>
<w>170</w>
<h>230</h>
</coordinates>
<panel_attributes>lt=&lt;&lt;&lt;-</panel_attributes>
<additional_attributes>10.0;10.0;10.0;50.0;150.0;50.0;150.0;210.0</additional_attributes>
</element>
<element>
<id>Relation</id>
<coordinates>
<x>440</x>
<y>450</y>
<w>30</w>
<h>80</h>
</coordinates>
<panel_attributes>lt=&lt;&lt;&lt;-</panel_attributes>
<additional_attributes>10.0;10.0;10.0;60.0</additional_attributes>
</element>
<element>
<id>Relation</id>
<coordinates>
<x>530</x>
<y>450</y>
<w>170</w>
<h>80</h>
</coordinates>
<panel_attributes>lt=&lt;&lt;&lt;-</panel_attributes>
<additional_attributes>150.0;10.0;150.0;40.0;10.0;40.0;10.0;60.0</additional_attributes>
</element>
<element>
<id>Relation</id>
<coordinates>
<x>520</x>
<y>450</y>
<w>30</w>
<h>80</h>
</coordinates>
<panel_attributes>lt=&lt;&lt;&lt;-</panel_attributes>
<additional_attributes>10.0;10.0;10.0;60.0</additional_attributes>
</element>
<element>
<id>Relation</id>
<coordinates>
<x>440</x>
<y>530</y>
<w>30</w>
<h>70</h>
</coordinates>
<panel_attributes>lt=&lt;&lt;&lt;-</panel_attributes>
<additional_attributes>10.0;10.0;10.0;50.0</additional_attributes>
</element>
<element>
<id>Relation</id>
<coordinates>
<x>530</x>
<y>530</y>
<w>30</w>
<h>70</h>
</coordinates>
<panel_attributes>lt=&lt;&lt;&lt;-</panel_attributes>
<additional_attributes>10.0;10.0;10.0;50.0</additional_attributes>
</element>
<element>
<id>UMLClass</id>
<coordinates>
<x>20</x>
<y>30</y>
<w>350</w>
<h>160</h>
</coordinates>
<panel_attributes>/Info/

Shows the hierarchy of the modules of the
project, not considering the android packages yet.

All dependencies are transitive.
For example Common is dependend on go.graphics.
And because Logic is dependend on Common it
is also dependend on go.graphics.</panel_attributes>
<additional_attributes/>
</element>
</diagram>
3 changes: 2 additions & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
apply plugin: 'java'
apply plugin: "eclipse"

ext {

Expand Down Expand Up @@ -39,7 +40,6 @@ allprojects {


subprojects {

plugins.withType(JavaPlugin).whenPluginAdded {
compileJava {
sourceCompatibility = JavaVersion.VERSION_11
Expand Down Expand Up @@ -88,6 +88,7 @@ subprojects {

def addGlobalDependencies = {
dependencies {
implementation 'com.google.code.gson:gson:2.9.0'
testImplementation 'junit:junit:4.12'
}
}
Expand Down
1 change: 1 addition & 0 deletions go.graphics.android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
apply plugin: 'com.android.library'
apply plugin: 'eclipse'

import jsettlers.shaders.compile.ShaderCompilationTask

Expand Down
5 changes: 3 additions & 2 deletions go.graphics.swing/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
apply plugin: 'java'
apply plugin: 'java-library'
apply plugin: 'eclipse'

import jsettlers.shaders.compile.ShaderCompilationTask

Expand All @@ -22,7 +23,7 @@ String[] modules = new String[] {
}

dependencies {
implementation project(':go.graphics')
api project(':go.graphics')

def lwjglVersion = rootProject.ext.lwjglVersion

Expand Down
3 changes: 2 additions & 1 deletion go.graphics/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
apply plugin: 'java'
apply plugin: 'java'
apply plugin: 'eclipse'
36 changes: 18 additions & 18 deletions jsettlers.common/.externalToolBuilders/createTextures.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/jsettlers.common/gen&quot; type=&quot;2&quot;/&gt;&#10;&lt;item path=&quot;/jsettlers.common/resources/images&quot; type=&quot;2&quot;/&gt;&#10;&lt;/resources&gt;}"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/jsettlers.common"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="4"/>
</listAttribute>
<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jsettlers.common"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/jsettlers.common/build/createTextures.ant&quot; type=&quot;1&quot;/&gt;&#10;&lt;item path=&quot;/jsettlers.common/build/jsettlers&quot; type=&quot;2&quot;/&gt;&#10;&lt;item path=&quot;/jsettlers.common/resources/textures_raw&quot; type=&quot;2&quot;/&gt;&#10;&lt;/resources&gt;}"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/jsettlers.common/build/createTextures.ant}"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value=""/>
<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/jsettlers.common}"/>
<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/jsettlers.common/gen&quot; type=&quot;2&quot;/&gt;&#10;&lt;item path=&quot;/jsettlers.common/resources/images&quot; type=&quot;2&quot;/&gt;&#10;&lt;/resources&gt;}"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/jsettlers.common"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="4"/>
</listAttribute>
<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jsettlers.common"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/jsettlers.common/build/createTextures.ant&quot; type=&quot;1&quot;/&gt;&#10;&lt;item path=&quot;/jsettlers.common/build/jsettlers&quot; type=&quot;2&quot;/&gt;&#10;&lt;item path=&quot;/jsettlers.common/resources/textures_raw&quot; type=&quot;2&quot;/&gt;&#10;&lt;/resources&gt;}"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/jsettlers.common/build/createTextures.ant}"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value=""/>
<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/jsettlers.common}"/>
</launchConfiguration>
32 changes: 16 additions & 16 deletions jsettlers.common/.externalToolBuilders/findCommit.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/jsettlers.common/gen&quot; type=&quot;2&quot;/&gt;&#10;&lt;/resources&gt;}"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/jsettlers.common"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="4"/>
</listAttribute>
<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jsettlers.common"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/jsettlers.common/build/findCommit.ant}"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value=""/>
<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/jsettlers.common/gen&quot; type=&quot;2&quot;/&gt;&#10;&lt;/resources&gt;}"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/jsettlers.common"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="4"/>
</listAttribute>
<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jsettlers.common"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/jsettlers.common/build/findCommit.ant}"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value=""/>
<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
</launchConfiguration>
3 changes: 1 addition & 2 deletions jsettlers.common/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apply plugin: 'java-library'

apply plugin: "eclipse"

import jsettlers.textures.generation.TextureGenerationTask
import org.eclipse.jgit.lib.Repository
Expand Down Expand Up @@ -64,7 +64,6 @@ clean {

dependencies {
api project(':go.graphics')
testImplementation project(':jsettlers.testutils')
}

copyMainResources {
Expand Down
Loading