Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/maven/org.ow2.asm-asm-all-6.0_BETA
Browse files Browse the repository at this point in the history
  • Loading branch information
khatchad authored Nov 11, 2024
2 parents 161a6aa + 49b2887 commit 4f13e12
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 3 deletions.
25 changes: 25 additions & 0 deletions Apply spotless.launch
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
<intAttribute key="M2_COLORS" value="0"/>
<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
<stringAttribute key="M2_GOALS" value="spotless:apply"/>
<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
<booleanAttribute key="M2_OFFLINE" value="true"/>
<stringAttribute key="M2_PROFILES" value=""/>
<listAttribute key="M2_PROPERTIES"/>
<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
<booleanAttribute key="M2_SKIP_TESTS" value="true"/>
<intAttribute key="M2_THREADS" value="1"/>
<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
<stringAttribute key="M2_USER_SETTINGS" value=""/>
<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="true"/>
<booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${workspace}"/>
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
</listAttribute>
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/ml}"/>
</launchConfiguration>
2 changes: 1 addition & 1 deletion com.ibm.wala.cast.python.ml/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.4.1</version>
<version>3.6.0</version>
<configuration>
<filters>
<filter>
Expand Down
2 changes: 1 addition & 1 deletion com.ibm.wala.cast.python.ml/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
ME=`realpath $0`
DIR=`dirname $ME`

cat -u | tee -a /tmp/lsp.in.log | $JAVA_HOME/bin/java -Xdebug -Xrunjdwp:transport=dt_socket,address=127.0.0.1:6660,server=y,suspend=n -jar $DIR/target/com.ibm.wala.cast.python.ml-0.6.0-SNAPSHOT.jar --mode stdio | tee -a /tmp/lsp.out.log
cat -u | tee -a /tmp/lsp.in.log | $JAVA_HOME/bin/java -Xdebug -Xrunjdwp:transport=dt_socket,address=127.0.0.1:6660,server=y,suspend=n -jar $DIR/target/com.ibm.wala.cast.python.ml-0.38.0-SNAPSHOT.jar --mode stdio | tee -a /tmp/lsp.out.log
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ public static String removeFileProtocolFromPath(String path) {
* presented in the CAst.
*/
public static Collection<String> getNames(Collection<CAstAnnotation> annotations) {
if (annotations == null) return emptyList();
return annotations.stream().map(Util::getName).flatMap(Optional::stream).toList();
}

Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
black==24.8.0
black==24.10.0

0 comments on commit 4f13e12

Please sign in to comment.