Merge branch 'processing:main' into develop-menu

Author: Stefterv

build.gradle.kts

@@ -4,8 +4,27 @@ plugins {
 
     alias(libs.plugins.compose.compiler) apply false
     alias(libs.plugins.jetbrainsCompose) apply false
+
+    alias(libs.plugins.versions)
 }
 
 // Set the build directory to not /build to prevent accidental deletion through the clean action
 // Can be deleted after the migration to Gradle is complete
-layout.buildDirectory = file(".build")
+layout.buildDirectory = file(".build")
+
+// Configure the dependencyUpdates task
+tasks {
+    dependencyUpdates {
+        gradleReleaseChannel = "current"
+
+        val nonStableKeywords = listOf("alpha", "beta", "rc")
+
+        fun isNonStable(version: String) = nonStableKeywords.any {
+            version.lowercase().contains(it)
+        }
+
+        rejectVersionIf {
+            isNonStable(candidate.version) && !isNonStable(currentVersion)
+        }
+    }
+}

core/src/processing/core/PApplet.java

@@ -802,6 +802,7 @@ public PSurface getSurface() {
   // Unlike the others above, needs to be public to support
   // the pixelWidth and pixelHeight fields.
   public int pixelDensity = 1;
+  boolean pixelDensityWarning = false;
 
   boolean present;
 
@@ -1082,6 +1083,9 @@ public int displayDensity(int display) {
   */
   public void pixelDensity(int density) {
     //println(density + " " + this.pixelDensity);
+
+
+    this.pixelDensityWarning = false;
     if (density != this.pixelDensity) {
       if (insideSettings("pixelDensity", density)) {
         if (density != 1 && density != 2) {
@@ -2050,6 +2054,10 @@ public void handleDraw() {
     if (frameCount == 0) {
       setup();
 
+      if(pixelDensityWarning){
+        System.err.println("Warning: Processing now sets pixelDensity(2) by default on high-density screens. This may change how your sketch looks. To revert to the old behavior, set pixelDensity(1) in setup().");
+      }
+
     } else {  // frameCount > 0, meaning an actual draw()
       // update the current frameRate
 
@@ -10106,6 +10114,7 @@ static public void runSketch(final String[] args,
     sketch.fullScreen = fullScreen;
 
     sketch.pixelDensity = sketch.displayDensity();
+    sketch.pixelDensityWarning = sketch.pixelDensity > 1;
 
     // For 3.0.1, moved this above handleSettings() so that loadImage() can be
     // used inside settings(). Sets a terrible precedent, but the alternative

gradle/libs.versions.toml

@@ -43,4 +43,5 @@ compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "
 serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 download = { id = "de.undercouch.download", version = "5.6.0" }
 mavenPublish = { id = "com.vanniktech.maven.publish", version = "0.30.0" }
-gradlePublish = { id = "com.gradle.plugin-publish", version = "1.2.1" }
+versions = { id = "com.github.ben-manes.versions", version = "0.52.0" }
+gradlePublish = { id = "com.gradle.plugin-publish", version = "1.2.1" }

java/build.gradle.kts

@@ -87,7 +87,8 @@ legacyLibraries.forEach { library ->
     }
 }
 
-val libraries = arrayOf("pdf")
+val libraries = arrayOf("dxf", "pdf")
+
 libraries.forEach { library ->
     val name = "create-$library-library"
     tasks.register<Copy>(name) {

java/libraries/dxf/build.gradle.kts

@@ -1 +1,39 @@
-ant.importBuild("build.xml")
+plugins{
+    java
+}
+
+sourceSets {
+    main {
+        java {
+            srcDirs("src")
+        }
+    }
+}
+repositories{
+    mavenCentral()
+    maven("https://jogamp.org/deployment/maven/")
+}
+
+dependencies{
+    compileOnly(project(":core"))
+
+    implementation("com.lowagie:itext:2.1.7")
+}
+
+tasks.register<Copy>("createLibrary"){
+    dependsOn("jar")
+    into(layout.buildDirectory.dir("library"))
+
+    from(layout.projectDirectory){
+        include ("library.properties")
+        include("examples/**")
+    }
+
+    from(configurations.runtimeClasspath){
+        into("library")
+    }
+
+    from(tasks.jar) {
+        into("library")
+    }
+}

java/test/processing/mode/java/ParserTests.java

@@ -280,7 +280,7 @@ public void bug1525() {
 
   @Test
   public void bug1532() {
-    expectRecognitionException("bug1532", 50);
+    expectRecognitionException("bug1532", 43);
   }
 
   @Test

java/test/resources/bug1532.pde

@@ -19,13 +19,6 @@ Capture cam;
 flatCube[][] grid;
 
 void setup() {
-  try {
-    quicktime.QTSession.open();
-  } 
-  catch (quicktime.QTException qte) { 
-    qte.printStackTrace();
-  }
-
   size (dx,dy,OPENGL);
   int d=day();
   int m=month();