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.

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

Win build #1433

Merged
merged 6 commits into from
Dec 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file removed headless-services/.mvn/wrapper/maven-wrapper.jar
Binary file not shown.
5 changes: 3 additions & 2 deletions headless-services/.mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,6 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
wrapperVersion=3.3.2
distributionType=only-script
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
*******************************************************************************/
package org.springframework.ide.vscode.languageserver.testharness;

import java.io.File;
import java.nio.file.Path;
import java.nio.file.Paths;

Expand All @@ -19,10 +20,12 @@

public class ClasspathTestUtil {

public static final String MAIN_JAVA = "main" + File.separatorChar + "java";

public static Path getOutputFolder(IJavaProject jp) throws Exception {
for (CPE cpe : jp.getClasspath().getClasspathEntries()) {
if (Classpath.isSource(cpe)) {
if (cpe.getPath().endsWith("main/java")) {
if (cpe.getPath().endsWith(MAIN_JAVA)) {
return Paths.get(cpe.getOutputFolder());
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -766,7 +766,7 @@ public String createTempUri(String extension) throws Exception {
if (extension == null) {
extension = getFileExtension();
}
return File.createTempFile("workingcopy", extension).toURI().toASCIIString();
return File.createTempFile("workingcopy", extension).toPath().toUri().toASCIIString();
}

public void assertCompletion(String textBefore, String expectTextAfter) throws Exception {
Expand Down
Loading
Loading