Merge branch 'master' into 267-initial-tensor-dimensions-arent-always-accurate

Author: khatchad

com.ibm.wala.cast.python.jython.test/.settings/org.eclipse.jdt.core.prefs

@@ -18,7 +18,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
-org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.release=enabled
 org.eclipse.jdt.core.compiler.source=21
 org.eclipse.jdt.core.incompatibleJDKLevel=ignore
 org.eclipse.jdt.core.incompleteClasspath=error

com.ibm.wala.cast.python/.settings/org.eclipse.core.resources.prefs

@@ -1,4 +1,6 @@
 eclipse.preferences.version=1
+encoding//src/test/java=UTF-8
+encoding//src/test/resources=UTF-8
 encoding/<project>=UTF-8
 encoding/data=UTF-8
 encoding/source=UTF-8