Merge pull request #414 from fujaba/fix/remove-mockups

Remove fulibMockups
fujaba · Feb 22, 2024 · 03cb473 · 03cb473
2 parents 584daa1 + 488ef1a
commit 03cb473
Show file tree

Hide file tree

Showing 11 changed files with 7 additions and 107 deletions.
diff --git a/backend/build.gradle b/backend/build.gradle
@@ -29,22 +29,19 @@ repositories {
 
 ext {
 	// https://mvnrepository.com/artifact/org.fulib/fulib
-	fulibDependency = [ group: 'org.fulib', name: 'fulib', version: '1.6.1' ]
+	fulibDependency = [ group: 'org.fulib', name: 'fulib', version: '1.6.2' ]
 
 	// https://mvnrepository.com/artifact/org.fulib/fulibScenarios
-	fulibScenariosDependency = [ group: 'org.fulib', name: 'fulibScenarios', version: '1.7.0' ]
+	fulibScenariosDependency = [ group: 'org.fulib', name: 'fulibScenarios', version: '1.7.1' ]
 
 	// https://mvnrepository.com/artifact/org.fulib/fulibTools
-	fulibToolsDependency = [ group: 'org.fulib', name: 'fulibTools', version: '1.5.1' ]
-
-	// https://mvnrepository.com/artifact/org.fulib/fulibMockups
-	fulibMockupsDependency = [ group: 'org.fulib', name: 'fulibMockups', version: '0.4.0' ]
+	fulibToolsDependency = [ group: 'org.fulib', name: 'fulibTools', version: '1.6.0' ]
 
 	// https://mvnrepository.com/artifact/org.fulib/fulibTables
 	fulibTablesDependency = [ group: 'org.fulib', name: 'fulibTables', version: '1.4.0' ]
 
 	// https://mvnrepository.com/artifact/org.fulib/fulibWorkflows
-	fulibWorkflowsDependency = [ group: 'org.fulib', name: 'fulibWorkflows', version: '0.5.6' ]
+	fulibWorkflowsDependency = [ group: 'org.fulib', name: 'fulibWorkflows', version: '0.6.0' ]
 
 	// https://mvnrepository.com/artifact/junit/junit
 	junitDependency = [ group: 'junit', name: 'junit', version: '4.13.2' ]
@@ -68,7 +65,6 @@ dependencies {
 
 	implementation fulibDependency
 	implementation fulibScenariosDependency
-	implementation fulibMockupsDependency
 	implementation fulibTablesDependency
 
 	// --------------- Other Libraries ---------------
@@ -110,7 +106,6 @@ processResources {
 	def fulibTablesVersion = getDependencyVersion(config, 'org.fulib', 'fulibTables')
 	def fulibScenariosVersion = getDependencyVersion(config, 'org.fulib', 'fulibScenarios')
 	def fulibGradleVersion = getDependencyVersion(rootProject.buildscript.configurations.classpath, 'org.fulib', 'fulibGradle')
-	def fulibMockupsVersion = getDependencyVersion(config, 'org.fulib', 'fulibMockups')
 	def junitVersion = getDependencyVersion(config, 'junit', 'junit')
 	def slf4jVersion = getDependencyVersion(config, 'org.slf4j', 'slf4j-simple')
 
@@ -131,7 +126,6 @@ processResources {
 			it = it.replace('$$fulibYamlVersion$$', fulibYamlVersion)
 			it = it.replace('$$fulibTablesVersion$$', fulibTablesVersion)
 			it = it.replace('$$fulibScenariosVersion$$', fulibScenariosVersion)
-			it = it.replace('$$fulibMockupsVersion$$', fulibMockupsVersion)
 			it = it.replace('$$fulibGradleVersion$$', fulibGradleVersion)
 			it = it.replace('$$fulibWorkflowsVersion$$', fulibWorkflowsDependency.version)
 			it = it.replace('$$junitVersion$$', junitVersion)

diff --git a/backend/src/main/java/org/fulib/webapp/tool/Tools.java b/backend/src/main/java/org/fulib/webapp/tool/Tools.java
@@ -1,6 +1,5 @@
 package org.fulib.webapp.tool;
 
-import org.fulib.mockups.FulibMockups;
 import org.fulib.scenarios.tool.ScenarioCompiler;
 import org.junit.runner.JUnitCore;
 import org.junit.runner.Result;
@@ -64,8 +63,6 @@ public static int scenarioc(
 	)
 	{
 		final List<String> finalArgs = new ArrayList<>(8 + args.length);
-		finalArgs.add("--classpath");
-		finalArgs.add(FulibMockups.class.getProtectionDomain().getCodeSource().getLocation().getPath());
 		finalArgs.add("-m");
 		finalArgs.add(modelSrcDir.toString());
 		finalArgs.add("-t");

diff --git a/backend/src/main/resources/org/fulib/webapp/projectzip/build.gradle b/backend/src/main/resources/org/fulib/webapp/projectzip/build.gradle
@@ -25,9 +25,6 @@ dependencies {
 	// https://mvnrepository.com/artifact/org.fulib/fulibTables
 	testImplementation group: 'org.fulib', name: 'fulibTables', version: '$$fulibTablesVersion$$'
 
-	// https://mvnrepository.com/artifact/org.fulib/fulibMockups
-	testImplementation group: 'org.fulib', name: 'fulibMockups', version: '$$fulibMockupsVersion$$'
-
 	// https://mvnrepository.com/artifact/junit/junit
 	testImplementation group: 'junit', name: 'junit', version: '$$junitVersion$$'
 

diff --git a/backend/src/main/resources/org/fulib/webapp/version.properties b/backend/src/main/resources/org/fulib/webapp/version.properties
@@ -4,6 +4,5 @@ fulibTools=$$fulibToolsVersion$$
 fulibYaml=$$fulibYamlVersion$$
 fulibTables=$$fulibTablesVersion$$
 fulibScenarios=$$fulibScenariosVersion$$
-fulibMockups=$$fulibMockupsVersion$$
 fulibGradle=$$fulibGradleVersion$$
 fulibWorkflows=$$fulibWorkflowsVersion$$
diff --git a/backend/src/test/java/org/fulib/webapp/projectzip/ProjectZipControllerTest.java b/backend/src/test/java/org/fulib/webapp/projectzip/ProjectZipControllerTest.java
@@ -54,20 +54,17 @@ public class ProjectZipControllerTest
 
 			dependencies {
 			\t// https://mvnrepository.com/artifact/org.fulib/fulibScenarios
-			\tfulibScenarios group: 'org.fulib', name: 'fulibScenarios', version: '1.7.0'
+			\tfulibScenarios group: 'org.fulib', name: 'fulibScenarios', version: '1.7.1'
 
 			\t// https://mvnrepository.com/artifact/org.slf4j/slf4j-simple
 			\tfulibScenarios group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.36'
 
 			\t// https://mvnrepository.com/artifact/org.fulib/fulibTools
-			\ttestImplementation group: 'org.fulib', name: 'fulibTools', version: '1.5.1'
+			\ttestImplementation group: 'org.fulib', name: 'fulibTools', version: '1.6.0'
 
 			\t// https://mvnrepository.com/artifact/org.fulib/fulibTables
 			\ttestImplementation group: 'org.fulib', name: 'fulibTables', version: '1.4.0'
 
-			\t// https://mvnrepository.com/artifact/org.fulib/fulibMockups
-			\ttestImplementation group: 'org.fulib', name: 'fulibMockups', version: '0.4.0'
-
 			\t// https://mvnrepository.com/artifact/junit/junit
 			\ttestImplementation group: 'junit', name: 'junit', version: '4.13.2'
 
@@ -150,7 +147,7 @@ public void handle() throws IOException
 		assertThat(files, hasItems(EXPECTED_FILES));
 		for (final Map.Entry<String, String> entry : EXPECTED_CONTENT.entrySet())
 		{
-			assertEquals(entry.getKey(), contents.get(entry.getKey()), entry.getValue());
+			assertEquals(entry.getKey(), entry.getValue(), contents.get(entry.getKey()));
 		}
 	}
 }
diff --git a/frontend/src/app/components/feedback/feedback.component.html b/frontend/src/app/components/feedback/feedback.component.html
@@ -19,10 +19,6 @@
          href="https://github.com/fujaba/fulibWorkflows/issues/new/choose">
         The workflows or generated files (fulibWorkflows)
       </a>
-      <a role="button" class="btn btn-outline-secondary"
-         href="https://github.com/fujaba/fulibMockups/issues/new/choose">
-        The HTML mockups (fulibMockups)
-      </a>
       <a role="button" class="btn btn-outline-secondary"
          href="https://github.com/fujaba/fulib/issues/new/choose">
         The generated model classes (fulib)

diff --git a/frontend/src/app/editor/examples.service.ts b/frontend/src/app/editor/examples.service.ts
@@ -40,11 +40,6 @@ export class ExamplesService {
         {name: 'Piecewise Definition'},
       ],
     },
-    {
-      name: 'Prototyping', examples: [
-        {name: 'UIs'},
-      ],
-    },
   ];
 
   constructor(

diff --git a/frontend/src/app/services/changelog.service.ts b/frontend/src/app/services/changelog.service.ts
@@ -14,7 +14,6 @@ export const REPOS = [
   'fulibYaml',
   'fulibTables',
   'fulibScenarios',
-  'fulibMockups',
   'fulibGradle',
   'fulibWorkflows'
 ] as const;

diff --git a/frontend/src/assets/examples/prototyping/UIs.md b/frontend/src/assets/examples/prototyping/UIs.md
diff --git a/frontend/src/assets/examples/testing/ObjectDiagrams.md b/frontend/src/assets/examples/testing/ObjectDiagrams.md
@@ -32,10 +32,6 @@ The Pumps has price 42.42.
 
 ![Sneakers, Pumps](images/products.txt)
 
-> The .tables.html format shows nicely formatted tables:
-
-![Amazon](images/products.tables.html)
-
 # More Info
 
 > The documentation goes into more depth about how to create diagrams and display data:

diff --git a/projects/fulib/build.gradle b/projects/fulib/build.gradle
@@ -18,9 +18,6 @@ dependencies {
 	// https://mvnrepository.com/artifact/org.fulib/fulibTools
 	testImplementation group: 'org.fulib', name: 'fulibTools', version: '1.5.1'
 
-	// https://mvnrepository.com/artifact/org.fulib/fulibMockups
-	testImplementation group: 'org.fulib', name: 'fulibMockups', version: '0.4.0'
-
 	// https://mvnrepository.com/artifact/org.fulib/fulibTables
 	testImplementation group: 'org.fulib', name: 'fulibTables', version: '1.4.0'
 }