Skip to content

Commit c081208

Browse files
anthonydmaysanthonydmays
committed
chore: downgrades devcontainer to Java 17 and adds Live Server extension.
1 parent 8d66eb1 commit c081208

7 files changed

Lines changed: 93 additions & 118 deletions

File tree

‎.devcontainer/devcontainer.json‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,26 @@
1-
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
2-
// README at: https://github.com/devcontainers/templates/tree/main/src/universal
31
{
4-
"name": "Default Linux Universal",
5-
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
2+
"name": "Debian",
63
"image": "mcr.microsoft.com/devcontainers/base:bullseye",
74
"features": {
85
"ghcr.io/devcontainers/features/dotnet:2": {},
9-
"ghcr.io/devcontainers/features/java:1": {},
6+
"ghcr.io/devcontainers/features/java:1": {
7+
"installGradle": true,
8+
"installMaven": true,
9+
"version": "17",
10+
"jdkDistro": "ms",
11+
"gradleVersion": "latest",
12+
"mavenVersion": "latest"
13+
},
1014
"ghcr.io/devcontainers/features/node:1": {},
1115
"ghcr.io/devcontainers/features/python:1": {},
1216
"ghcr.io/devcontainers-contrib/features/ts-node:1": {}
1317
},
18+
"portsAttributes": {
19+
"80": {
20+
"requireLocalPort": true,
21+
"elevateIfNeeded": true
22+
}
23+
},
1424
"customizations": {
1525
"vscode": {
1626
"extensions": [
@@ -19,7 +29,8 @@
1929
"esbenp.prettier-vscode",
2030
"donjayamanne.python-extension-pack",
2131
"ms-vscode.vscode-typescript-next",
22-
"ms-dotnettools.csdevkit"
32+
"ms-dotnettools.csdevkit",
33+
"ritwickdey.LiveServer"
2334
]
2435
}
2536
}

‎.vscode/settings.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
{
2-
"dotnet.defaultSolution": "c-sharp.sln"
2+
"dotnet.defaultSolution": "c-sharp.sln",
3+
"java.compile.nullAnalysis.mode": "automatic"
34
}

‎java/.project‎

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,34 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<projectDescription>
3-
<name>java</name>
3+
<name>codedifferently</name>
44
<comment></comment>
5-
<projects/>
6-
<natures>
7-
<nature>org.eclipse.jdt.core.javanature</nature>
8-
</natures>
5+
<projects>
6+
</projects>
97
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
1013
<buildCommand>
1114
<name>org.eclipse.jdt.core.javabuilder</name>
12-
<arguments/>
15+
<arguments>
16+
</arguments>
1317
</buildCommand>
1418
</buildSpec>
15-
<linkedResources/>
16-
<filteredResources/>
19+
<natures>
20+
<nature>org.eclipse.jdt.core.javanature</nature>
21+
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
22+
</natures>
23+
<filteredResources>
24+
<filter>
25+
<id>1708117550454</id>
26+
<name></name>
27+
<type>30</type>
28+
<matcher>
29+
<id>org.eclipse.core.resources.regexFilterMatcher</id>
30+
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
31+
</matcher>
32+
</filter>
33+
</filteredResources>
1734
</projectDescription>

‎java/codedifferently-app/.classpath‎

Lines changed: 9 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -1,114 +1,32 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="output" path="bin/default"/>
4-
<classpathentry output="bin/main" kind="src" path="src/main/java">
5-
<attributes>
6-
<attribute name="gradle_scope" value="main"/>
7-
<attribute name="gradle_used_by_scope" value="main,test"/>
8-
</attributes>
9-
</classpathentry>
10-
<classpathentry output="bin/main" kind="src" path="src/main/resources">
11-
<attributes>
12-
<attribute name="gradle_scope" value="main"/>
13-
<attribute name="gradle_used_by_scope" value="main,test"/>
14-
</attributes>
15-
</classpathentry>
16-
<classpathentry output="bin/test" kind="src" path="src/test/java">
3+
<classpathentry kind="src" output="bin/test" path="src/test/resources">
174
<attributes>
185
<attribute name="gradle_scope" value="test"/>
196
<attribute name="gradle_used_by_scope" value="test"/>
207
<attribute name="test" value="true"/>
218
</attributes>
229
</classpathentry>
23-
<classpathentry output="bin/test" kind="src" path="src/test/resources">
10+
<classpathentry kind="src" output="bin/test" path="src/test/java">
2411
<attributes>
2512
<attribute name="gradle_scope" value="test"/>
2613
<attribute name="gradle_used_by_scope" value="test"/>
2714
<attribute name="test" value="true"/>
2815
</attributes>
2916
</classpathentry>
30-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21/"/>
31-
<classpathentry sourcepath="/home/vscode/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/31.1-jre/c388a68bc2b17a314dfa7c769d858ada0fc32dcf/guava-31.1-jre-sources.jar" kind="lib" path="/home/vscode/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/31.1-jre/60458f877d055d0c9114d9e1a2efb737b4bc282c/guava-31.1-jre.jar">
32-
<attributes>
33-
<attribute name="gradle_used_by_scope" value="main,test"/>
34-
</attributes>
35-
</classpathentry>
36-
<classpathentry sourcepath="/home/vscode/.gradle/caches/modules-2/files-2.1/com.google.guava/failureaccess/1.0.1/1d064e61aad6c51cc77f9b59dc2cccc78e792f5a/failureaccess-1.0.1-sources.jar" kind="lib" path="/home/vscode/.gradle/caches/modules-2/files-2.1/com.google.guava/failureaccess/1.0.1/1dcf1de382a0bf95a3d8b0849546c88bac1292c9/failureaccess-1.0.1.jar">
37-
<attributes>
38-
<attribute name="gradle_used_by_scope" value="main,test"/>
39-
</attributes>
40-
</classpathentry>
41-
<classpathentry kind="lib" path="/home/vscode/.gradle/caches/modules-2/files-2.1/com.google.guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/b421526c5f297295adef1c886e5246c39d4ac629/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar">
42-
<attributes>
43-
<attribute name="gradle_used_by_scope" value="main,test"/>
44-
</attributes>
45-
</classpathentry>
46-
<classpathentry sourcepath="/home/vscode/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/b19b5927c2c25b6c70f093767041e641ae0b1b35/jsr305-3.0.2-sources.jar" kind="lib" path="/home/vscode/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar">
47-
<attributes>
48-
<attribute name="gradle_used_by_scope" value="main,test"/>
49-
</attributes>
50-
</classpathentry>
51-
<classpathentry sourcepath="/home/vscode/.gradle/caches/modules-2/files-2.1/org.checkerframework/checker-qual/3.12.0/10dacb8b36398debceca36cd0db5f3316967f80e/checker-qual-3.12.0-sources.jar" kind="lib" path="/home/vscode/.gradle/caches/modules-2/files-2.1/org.checkerframework/checker-qual/3.12.0/d5692f0526415fcc6de94bb5bfbd3afd9dd3b3e5/checker-qual-3.12.0.jar">
52-
<attributes>
53-
<attribute name="gradle_used_by_scope" value="main,test"/>
54-
</attributes>
55-
</classpathentry>
56-
<classpathentry sourcepath="/home/vscode/.gradle/caches/modules-2/files-2.1/com.google.errorprone/error_prone_annotations/2.11.0/d060e42b6aa896a3abe2ec612e1cf8cc307f8a49/error_prone_annotations-2.11.0-sources.jar" kind="lib" path="/home/vscode/.gradle/caches/modules-2/files-2.1/com.google.errorprone/error_prone_annotations/2.11.0/c5a0ace696d3f8b1c1d8cc036d8c03cc0cbe6b69/error_prone_annotations-2.11.0.jar">
17+
<classpathentry kind="src" output="bin/main" path="src/main/resources">
5718
<attributes>
19+
<attribute name="gradle_scope" value="main"/>
5820
<attribute name="gradle_used_by_scope" value="main,test"/>
5921
</attributes>
6022
</classpathentry>
61-
<classpathentry sourcepath="/home/vscode/.gradle/caches/modules-2/files-2.1/com.google.j2objc/j2objc-annotations/1.3/d26c56180205cbb50447c3eca98ecb617cf9f58b/j2objc-annotations-1.3-sources.jar" kind="lib" path="/home/vscode/.gradle/caches/modules-2/files-2.1/com.google.j2objc/j2objc-annotations/1.3/ba035118bc8bac37d7eff77700720999acd9986d/j2objc-annotations-1.3.jar">
23+
<classpathentry kind="src" output="bin/main" path="src/main/java">
6224
<attributes>
25+
<attribute name="gradle_scope" value="main"/>
6326
<attribute name="gradle_used_by_scope" value="main,test"/>
6427
</attributes>
6528
</classpathentry>
66-
<classpathentry sourcepath="/home/vscode/.gradle/caches/modules-2/files-2.1/org.junit.jupiter/junit-jupiter-params/5.9.1/f48e6a3bc9ac5acdde88951f83beb44adc78c8c5/junit-jupiter-params-5.9.1-sources.jar" kind="lib" path="/home/vscode/.gradle/caches/modules-2/files-2.1/org.junit.jupiter/junit-jupiter-params/5.9.1/ffcd1013edaeee112be11fcddeb38882d79238de/junit-jupiter-params-5.9.1.jar">
67-
<attributes>
68-
<attribute name="gradle_used_by_scope" value="test"/>
69-
<attribute name="test" value="true"/>
70-
</attributes>
71-
</classpathentry>
72-
<classpathentry sourcepath="/home/vscode/.gradle/caches/modules-2/files-2.1/org.junit.jupiter/junit-jupiter-api/5.9.1/ba8516b330a32b4957cdc6ad0cd1a594ec154fd2/junit-jupiter-api-5.9.1-sources.jar" kind="lib" path="/home/vscode/.gradle/caches/modules-2/files-2.1/org.junit.jupiter/junit-jupiter-api/5.9.1/7bb53fbc0173e9f6a9d21d58297af94b1f2f9ce1/junit-jupiter-api-5.9.1.jar">
73-
<attributes>
74-
<attribute name="gradle_used_by_scope" value="test"/>
75-
<attribute name="test" value="true"/>
76-
</attributes>
77-
</classpathentry>
78-
<classpathentry sourcepath="/home/vscode/.gradle/caches/modules-2/files-2.1/org.junit.platform/junit-platform-commons/1.9.1/5d2f1078b36f69b0cbacc1efdbf073517c0c7d33/junit-platform-commons-1.9.1-sources.jar" kind="lib" path="/home/vscode/.gradle/caches/modules-2/files-2.1/org.junit.platform/junit-platform-commons/1.9.1/3145f821b5cd10abcdc5f925baa5fffa6f1b628f/junit-platform-commons-1.9.1.jar">
79-
<attributes>
80-
<attribute name="gradle_used_by_scope" value="test"/>
81-
<attribute name="test" value="true"/>
82-
</attributes>
83-
</classpathentry>
84-
<classpathentry sourcepath="/home/vscode/.gradle/caches/modules-2/files-2.1/org.junit.jupiter/junit-jupiter/5.9.1/5fd01c33132462aab3905cb74bd1097a713ab91a/junit-jupiter-5.9.1-sources.jar" kind="lib" path="/home/vscode/.gradle/caches/modules-2/files-2.1/org.junit.jupiter/junit-jupiter/5.9.1/9274d3757e224bc02eae367bd481062a263c150b/junit-jupiter-5.9.1.jar">
85-
<attributes>
86-
<attribute name="gradle_used_by_scope" value="test"/>
87-
<attribute name="test" value="true"/>
88-
</attributes>
89-
</classpathentry>
90-
<classpathentry sourcepath="/home/vscode/.gradle/caches/modules-2/files-2.1/org.opentest4j/opentest4j/1.2.0/41d55b3c2254de9837b4ec8923cbd371b8a7eab5/opentest4j-1.2.0-sources.jar" kind="lib" path="/home/vscode/.gradle/caches/modules-2/files-2.1/org.opentest4j/opentest4j/1.2.0/28c11eb91f9b6d8e200631d46e20a7f407f2a046/opentest4j-1.2.0.jar">
91-
<attributes>
92-
<attribute name="gradle_used_by_scope" value="test"/>
93-
<attribute name="test" value="true"/>
94-
</attributes>
95-
</classpathentry>
96-
<classpathentry sourcepath="/home/vscode/.gradle/caches/modules-2/files-2.1/org.apiguardian/apiguardian-api/1.1.2/e0787a997746ac32639e0bf3cb27af8dce8a3428/apiguardian-api-1.1.2-sources.jar" kind="lib" path="/home/vscode/.gradle/caches/modules-2/files-2.1/org.apiguardian/apiguardian-api/1.1.2/a231e0d844d2721b0fa1b238006d15c6ded6842a/apiguardian-api-1.1.2.jar">
97-
<attributes>
98-
<attribute name="gradle_used_by_scope" value=""/>
99-
<attribute name="test" value="true"/>
100-
</attributes>
101-
</classpathentry>
102-
<classpathentry sourcepath="/home/vscode/.gradle/caches/modules-2/files-2.1/org.junit.jupiter/junit-jupiter-engine/5.9.1/bc082b8e8a1f40d6846fccb59867c6524bf08155/junit-jupiter-engine-5.9.1-sources.jar" kind="lib" path="/home/vscode/.gradle/caches/modules-2/files-2.1/org.junit.jupiter/junit-jupiter-engine/5.9.1/1bf771097bde296c3ab174861954e8aafaaf2e94/junit-jupiter-engine-5.9.1.jar">
103-
<attributes>
104-
<attribute name="gradle_used_by_scope" value="test"/>
105-
<attribute name="test" value="true"/>
106-
</attributes>
107-
</classpathentry>
108-
<classpathentry sourcepath="/home/vscode/.gradle/caches/modules-2/files-2.1/org.junit.platform/junit-platform-engine/1.9.1/bda902e43fe1f62674224452defd31f4c251e29d/junit-platform-engine-1.9.1-sources.jar" kind="lib" path="/home/vscode/.gradle/caches/modules-2/files-2.1/org.junit.platform/junit-platform-engine/1.9.1/83591e5089d6cea5f324aa3ecca9b19d5a275803/junit-platform-engine-1.9.1.jar">
109-
<attributes>
110-
<attribute name="gradle_used_by_scope" value="test"/>
111-
<attribute name="test" value="true"/>
112-
</attributes>
113-
</classpathentry>
29+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17/"/>
30+
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
31+
<classpathentry kind="output" path="bin/default"/>
11432
</classpath>

‎java/codedifferently-app/.project‎

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,33 @@
22
<projectDescription>
33
<name>codedifferently-app</name>
44
<comment></comment>
5-
<projects/>
6-
<natures>
7-
<nature>org.eclipse.jdt.core.javanature</nature>
8-
</natures>
5+
<projects>
6+
</projects>
97
<buildSpec>
108
<buildCommand>
119
<name>org.eclipse.jdt.core.javabuilder</name>
12-
<arguments/>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
<buildCommand>
14+
<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
15+
<arguments>
16+
</arguments>
1317
</buildCommand>
1418
</buildSpec>
15-
<linkedResources/>
16-
<filteredResources/>
19+
<natures>
20+
<nature>org.eclipse.jdt.core.javanature</nature>
21+
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
22+
</natures>
23+
<filteredResources>
24+
<filter>
25+
<id>1708117550463</id>
26+
<name></name>
27+
<type>30</type>
28+
<matcher>
29+
<id>org.eclipse.core.resources.regexFilterMatcher</id>
30+
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
31+
</matcher>
32+
</filter>
33+
</filteredResources>
1734
</projectDescription>

‎java/codedifferently-app/.settings/org.eclipse.buildship.core.prefs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
connection.project.dir=..
2+
eclipse.preferences.version=1

‎java/codedifferently-app/.settings/org.eclipse.jdt.core.prefs‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,22 @@
1-
#
2-
#Fri Feb 16 20:07:41 UTC 2024
31
eclipse.preferences.version=1
2+
org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=ignore
3+
org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
4+
org.eclipse.jdt.core.compiler.annotation.nonnull=javax.annotation.Nonnull
5+
org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=javax.annotation.ParametersAreNonnullByDefault
6+
org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.Nullable
7+
org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled
48
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
5-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
9+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
610
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
7-
org.eclipse.jdt.core.compiler.compliance=21
11+
org.eclipse.jdt.core.compiler.compliance=17
812
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
913
org.eclipse.jdt.core.compiler.debug.localVariable=generate
1014
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
1115
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
1216
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
13-
org.eclipse.jdt.core.compiler.source=21
17+
org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=warning
18+
org.eclipse.jdt.core.compiler.problem.nullReference=warning
19+
org.eclipse.jdt.core.compiler.problem.nullSpecViolation=warning
20+
org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
21+
org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=enabled
22+
org.eclipse.jdt.core.compiler.source=17

0 commit comments

Comments
 (0)