Skip to content
Snippets Groups Projects
Commit 5c979716 authored by MASSAT Jean luc's avatar MASSAT Jean luc
Browse files

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	.idea/workspace.xml
parents 94cefe46 5281c5ba
Branches
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
.idea/gradle.xml deleted 100644 → 0
+ 0
− 17
View file @ 94cefe46
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="GradleMigrationSettings" migrationVersion="1" />
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleHome" value="" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
</set>
</option>
</GradleProjectSettings>
</option>
</component>
</project>
\ No newline at end of file
.idea/vcs.xml deleted 100644 → 0
+ 0
− 6
View file @ 94cefe46
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>
\ No newline at end of file
.idea/workspace.xml
+ 24
− 64
View file @ 5c979716
...@@ -4,8 +4,11 @@ ...@@ -4,8 +4,11 @@
<option name="autoReloadType" value="SELECTIVE" /> <option name="autoReloadType" value="SELECTIVE" />
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="a17b64ea-8b68-4cd2-aba6-1780c674b35e" name="Changes" comment="Update"> <list default="true" id="a17b64ea-8b68-4cd2-aba6-1780c674b35e" name="Changes" comment="Clean">
<change beforePath="$PROJECT_DIR$/src/main/java/fr/univamu/solver/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/fr/univamu/solver/Main.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/gradle.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/gradle.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/fr/univamu/solver/Solver.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/fr/univamu/solver/Solver.java" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
...@@ -29,24 +32,23 @@ ...@@ -29,24 +32,23 @@
<option name="hideEmptyMiddlePackages" value="true" /> <option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" /> <option name="showLibraryContents" value="true" />
</component> </component>
<component name="PropertiesComponent"><![CDATA[{ <component name="PropertiesComponent">{
"keyToString": { &quot;keyToString&quot;: {
"Gradle.GL-Solver [:fr.univamu.solver.Main.main()].executor": "Run", &quot;Gradle.GL-Solver [:fr.univamu.solver.Main.main()].executor&quot;: &quot;Run&quot;,
"Gradle.PrivateTestSolver.testParser.executor": "Run", &quot;Gradle.Tests in 'GL-Solver'.executor&quot;: &quot;Run&quot;,
"Gradle.Tests in 'GL-Solver'.executor": "Run", &quot;Gradle.Tests in 'fr.univamu.solver'.executor&quot;: &quot;Run&quot;,
"Gradle.Tests in 'fr.univamu.solver'.executor": "Run", &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
"RunOnceActivity.ShowReadmeOnStart": "true", &quot;git-widget-placeholder&quot;: &quot;master&quot;,
"git-widget-placeholder": "master", &quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
"kotlin-language-version-configured": "true", &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
"node.js.detected.package.eslint": "true", &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
"node.js.detected.package.tslint": "true", &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
"node.js.selected.package.eslint": "(autodetect)", &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
"node.js.selected.package.tslint": "(autodetect)", &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
"nodejs_package_manager_path": "npm", &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
"vue.rearranger.settings.migration": "true"
} }
}]]></component> }</component>
<component name="RunManager" selected="Gradle.PrivateTestSolver.testParser"> <component name="RunManager" selected="Gradle.Tests in 'GL-Solver'">
<configuration name="Main" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true"> <configuration name="Main" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="fr.univamu.solver.Main" /> <option name="MAIN_CLASS_NAME" value="fr.univamu.solver.Main" />
<module name="GL-Solver.main" /> <module name="GL-Solver.main" />
...@@ -60,30 +62,6 @@ ...@@ -60,30 +62,6 @@
<option name="Make" enabled="true" /> <option name="Make" enabled="true" />
</method> </method>
</configuration> </configuration>
<configuration name="PrivateTestSolver.testParser" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
<ExternalSystemSettings>
<option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="externalSystemIdString" value="GRADLE" />
<option name="scriptParameters" value="" />
<option name="taskDescriptions">
<list />
</option>
<option name="taskNames">
<list>
<option value=":test" />
<option value="--tests" />
<option value="&quot;fr.univamu.solver.PrivateTestSolver.testParser&quot;" />
</list>
</option>
<option name="vmOptions" />
</ExternalSystemSettings>
<ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
<DebugAllEnabled>false</DebugAllEnabled>
<RunAsTest>true</RunAsTest>
<method v="2" />
</configuration>
<configuration name="Tests in 'GL-Solver'" type="GradleRunConfiguration" factoryName="Gradle" temporary="true"> <configuration name="Tests in 'GL-Solver'" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
<ExternalSystemSettings> <ExternalSystemSettings>
<option name="executionName" /> <option name="executionName" />
...@@ -132,7 +110,6 @@ ...@@ -132,7 +110,6 @@
</configuration> </configuration>
<recent_temporary> <recent_temporary>
<list> <list>
<item itemvalue="Gradle.PrivateTestSolver.testParser" />
<item itemvalue="Gradle.Tests in 'GL-Solver'" /> <item itemvalue="Gradle.Tests in 'GL-Solver'" />
<item itemvalue="Gradle.Tests in 'fr.univamu.solver'" /> <item itemvalue="Gradle.Tests in 'fr.univamu.solver'" />
<item itemvalue="Application.Main" /> <item itemvalue="Application.Main" />
...@@ -156,7 +133,7 @@ ...@@ -156,7 +133,7 @@
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1727967430355</updated> <updated>1727967430355</updated>
<workItem from="1727967431394" duration="6834000" /> <workItem from="1727967431394" duration="6834000" />
<workItem from="1728024944251" duration="4911000" /> <workItem from="1728024944251" duration="2652000" />
</task> </task>
<task id="LOCAL-00001" summary="Create"> <task id="LOCAL-00001" summary="Create">
<option name="closed" value="true" /> <option name="closed" value="true" />
...@@ -198,23 +175,7 @@ ...@@ -198,23 +175,7 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1727988463386</updated> <updated>1727988463386</updated>
</task> </task>
<task id="LOCAL-00006" summary="Update"> <option name="localTasksCounter" value="6" />
<option name="closed" value="true" />
<created>1728027672901</created>
<option name="number" value="00006" />
<option name="presentableId" value="LOCAL-00006" />
<option name="project" value="LOCAL" />
<updated>1728027672901</updated>
</task>
<task id="LOCAL-00007" summary="Update">
<option name="closed" value="true" />
<created>1728031559403</created>
<option name="number" value="00007" />
<option name="presentableId" value="LOCAL-00007" />
<option name="project" value="LOCAL" />
<updated>1728031559403</updated>
</task>
<option name="localTasksCounter" value="8" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
...@@ -224,7 +185,6 @@ ...@@ -224,7 +185,6 @@
<MESSAGE value="Create" /> <MESSAGE value="Create" />
<MESSAGE value="Add tests" /> <MESSAGE value="Add tests" />
<MESSAGE value="Clean" /> <MESSAGE value="Clean" />
<MESSAGE value="Update" /> <option name="LAST_COMMIT_MESSAGE" value="Clean" />
<option name="LAST_COMMIT_MESSAGE" value="Update" />
</component> </component>
</project> </project>
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment