Skip to content

Commit 046a216

Browse files
committed
Merge branch 'main' into gradle-runner
2 parents 570e9db + 198f593 commit 046a216

File tree

131 files changed

+1397
-25708
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

131 files changed

+1397
-25708
lines changed

.all-contributorsrc

Lines changed: 114 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,8 @@
350350
"avatar_url": "https://avatars.githubusercontent.com/u/3434564?v=4",
351351
"profile": "https://github.com/joshgiesbrecht",
352352
"contributions": [
353-
"code"
353+
"code",
354+
"bug"
354355
]
355356
},
356357
{
@@ -1491,7 +1492,8 @@
14911492
"profile": "https://github.com/babaissarkar",
14921493
"contributions": [
14931494
"code",
1494-
"a11y"
1495+
"a11y",
1496+
"doc"
14951497
]
14961498
},
14971499
{
@@ -1539,6 +1541,116 @@
15391541
"contributions": [
15401542
"code"
15411543
]
1544+
},
1545+
{
1546+
"login": "jd-boyd",
1547+
"name": "Joshua D. Boyd",
1548+
"avatar_url": "https://avatars.githubusercontent.com/u/361465?v=4",
1549+
"profile": "http://blog.jdboyd.net/",
1550+
"contributions": [
1551+
"doc"
1552+
]
1553+
},
1554+
{
1555+
"login": "Vaivaswat2244",
1556+
"name": "Vaivaswat Dubey",
1557+
"avatar_url": "https://avatars.githubusercontent.com/u/113991324?v=4",
1558+
"profile": "https://github.com/Vaivaswat2244",
1559+
"contributions": [
1560+
"code"
1561+
]
1562+
},
1563+
{
1564+
"login": "jSdCool",
1565+
"name": "jSdCool",
1566+
"avatar_url": "https://avatars.githubusercontent.com/u/37940266?v=4",
1567+
"profile": "https://www.cbi-games.org",
1568+
"contributions": [
1569+
"code",
1570+
"doc"
1571+
]
1572+
},
1573+
{
1574+
"login": "AhmedMagedC",
1575+
"name": "AhmedMaged",
1576+
"avatar_url": "https://avatars.githubusercontent.com/u/111961041?v=4",
1577+
"profile": "https://github.com/AhmedMagedC",
1578+
"contributions": [
1579+
"code"
1580+
]
1581+
},
1582+
{
1583+
"login": "ThexXTURBOXx",
1584+
"name": "Nico Mexis",
1585+
"avatar_url": "https://avatars.githubusercontent.com/u/12763829?v=4",
1586+
"profile": "http://nmexis.me",
1587+
"contributions": [
1588+
"code"
1589+
]
1590+
},
1591+
{
1592+
"login": "tychedelia",
1593+
"name": "charlotte 🌸",
1594+
"avatar_url": "https://avatars.githubusercontent.com/u/10366310?v=4",
1595+
"profile": "http://charlotte.fyi",
1596+
"contributions": [
1597+
"review"
1598+
]
1599+
},
1600+
{
1601+
"login": "jdebou",
1602+
"name": "Joackim de Bourqueney",
1603+
"avatar_url": "https://avatars.githubusercontent.com/u/80685479?v=4",
1604+
"profile": "http://i-j.fr",
1605+
"contributions": [
1606+
"code"
1607+
]
1608+
},
1609+
{
1610+
"login": "toniab",
1611+
"name": "Tonz",
1612+
"avatar_url": "https://avatars.githubusercontent.com/u/370199?v=4",
1613+
"profile": "https://github.com/toniab",
1614+
"contributions": [
1615+
"code",
1616+
"doc"
1617+
]
1618+
},
1619+
{
1620+
"login": "aj-m",
1621+
"name": "Andrew",
1622+
"avatar_url": "https://avatars.githubusercontent.com/u/2524348?v=4",
1623+
"profile": "https://github.com/aj-m",
1624+
"contributions": [
1625+
"code"
1626+
]
1627+
},
1628+
{
1629+
"login": "pnngocdoan",
1630+
"name": "Ngoc Doan",
1631+
"avatar_url": "https://avatars.githubusercontent.com/u/113954980?v=4",
1632+
"profile": "https://github.com/pnngocdoan",
1633+
"contributions": [
1634+
"code"
1635+
]
1636+
},
1637+
{
1638+
"login": "manoellribeiro",
1639+
"name": "Manoel Ribeiro",
1640+
"avatar_url": "https://avatars.githubusercontent.com/u/59377764?v=4",
1641+
"profile": "https://github.com/manoellribeiro",
1642+
"contributions": [
1643+
"doc"
1644+
]
1645+
},
1646+
{
1647+
"login": "catilac",
1648+
"name": "Moon",
1649+
"avatar_url": "https://avatars.githubusercontent.com/u/15107?v=4",
1650+
"profile": "https://softmoon.world",
1651+
"contributions": [
1652+
"code"
1653+
]
15421654
}
15431655
],
15441656
"repoType": "github",

.github/ISSUE_TEMPLATE/1_bug_report.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ body:
4242
- type: input
4343
attributes:
4444
label: Operating system
45-
description: "Ex: Windows/MacOSX/Linux/Android/iOS along with version"
45+
description: "Ex: Windows/macOS/Linux/Android/iOS along with version"
4646
validations:
4747
required: true
4848

@@ -60,11 +60,11 @@ body:
6060
label: Steps to reproduce this
6161
description: Describe what steps will produce the bug.
6262
value: |
63-
"1.
63+
1.
6464
6565
2.
6666
67-
3."
67+
3.
6868
validations:
6969
required: true
7070

@@ -111,4 +111,4 @@ body:
111111
attributes:
112112
value: |
113113
> [!NOTE]
114-
> Processing is a community-driven, open-source project. If you have time and interest to help, your contribution would be greatly appreciated! See the [contribution guide](https://github.com/processing/processing4/blob/main/CONTRIBUTING.md) to learn more. And if you need some guidance or support, we're happy to help you get started.
114+
> Processing is a community-driven, open-source project. If you have time and interest to help, your contribution would be greatly appreciated! See the [contribution guide](https://github.com/processing/processing4/blob/main/CONTRIBUTING.md) to learn more. And if you need some guidance or support, we're happy to help you get started.

.github/workflows/release-gradle.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@ jobs:
153153
ORG_GRADLE_PROJECT_compose.desktop.mac.notarization.password: ${{ secrets.PROCESSING_APP_PASSWORD }}
154154
ORG_GRADLE_PROJECT_compose.desktop.mac.notarization.teamID: ${{ secrets.PROCESSING_TEAM_ID }}
155155
ORG_GRADLE_PROJECT_snapname: ${{ vars.SNAP_NAME }}
156+
ORG_GRADLE_PROJECT_snapconfinement: ${{ vars.SNAP_CONFINEMENT }}
156157

157158
- name: Sign files with Trusted Signing
158159
if: runner.os == 'Windows'

.gitignore

Lines changed: 110 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -1,101 +1,70 @@
1-
.DS_Store
2-
.AppleDouble
3-
._*
4-
*~
5-
/build/shared/reference.zip
6-
7-
*.x
8-
9-
#*.iml
10-
#/.idea
11-
12-
# may need to bring this back later
13-
/.idea/codeStyles
14-
15-
# via https://github.com/github/gitignore/blob/master/Global/JetBrains.gitignore
16-
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
17-
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
18-
19-
# User-specific stuff
20-
.idea/**/workspace.xml
21-
.idea/**/tasks.xml
22-
.idea/**/usage.statistics.xml
23-
.idea/**/dictionaries
24-
.idea/**/shelf
25-
26-
# Generated files
27-
.idea/**/contentModel.xml
28-
29-
# Sensitive or high-churn files
30-
.idea/**/dataSources/
31-
.idea/**/dataSources.ids
32-
.idea/**/dataSources.local.xml
33-
.idea/**/sqlDataSources.xml
34-
.idea/**/dynamic.xml
35-
.idea/**/uiDesigner.xml
36-
.idea/**/dbnavigator.xml
37-
38-
# Gradle
39-
.idea/**/gradle.xml
40-
.idea/**/libraries
41-
42-
# Gradle and Maven with auto-import
43-
# When using Gradle or Maven with auto-import, you should exclude module files,
44-
# since they will be recreated, and may cause churn. Uncomment if using
45-
# auto-import.
46-
# .idea/modules.xml
47-
# .idea/*.iml
48-
# .idea/modules
49-
50-
# CMake
51-
cmake-build-*/
52-
53-
# Mongo Explorer plugin
54-
.idea/**/mongoSettings.xml
55-
56-
# File-based project format
57-
*.iws
1+
# Created by https://www.toptal.com/developers/gitignore/api/android,gradle,java
2+
# Edit at https://www.toptal.com/developers/gitignore?templates=android,gradle,java
3+
4+
### Android ###
5+
# Gradle files
6+
.gradle/
7+
build/
8+
9+
# Local configuration file (sdk path, etc)
10+
local.properties
11+
12+
# Log/OS Files
13+
*.log
14+
15+
# Android Studio generated files and folders
16+
captures/
17+
.externalNativeBuild/
18+
.cxx/
19+
*.apk
20+
output.json
5821

5922
# IntelliJ
60-
out/
23+
*.iml
24+
.idea/*
25+
misc.xml
26+
deploymentTargetDropDown.xml
27+
render.experimental.xml
6128

62-
# mpeltonen/sbt-idea plugin
63-
.idea_modules/
29+
# Keystore files
30+
*.jks
31+
*.keystore
6432

65-
# JIRA plugin
66-
atlassian-ide-plugin.xml
33+
# Google Services (e.g. APIs or Firebase)
34+
google-services.json
6735

68-
# Cursive Clojure plugin
69-
.idea/replstate.xml
36+
# Android Profiling
37+
*.hprof
7038

71-
# Crashlytics plugin (for Android Studio and IntelliJ)
72-
com_crashlytics_export_strings.xml
73-
crashlytics.properties
74-
crashlytics-build.properties
75-
fabric.properties
39+
### Android Patch ###
40+
gen-external-apklibs
7641

77-
# Editor-based Rest Client
78-
.idea/httpRequests
42+
# Replacement of .externalNativeBuild directories introduced
43+
# with Android Studio 3.5.
7944

80-
# Android studio 3.1+ serialized cache file
81-
.idea/caches/build_file_checksums.ser
45+
### Java ###
46+
# Compiled class file
47+
*.class
8248

83-
# temporarily ignore IntelliJ bits
84-
*.eml
49+
# Log file
8550

86-
# testing boogers
87-
bin-test
51+
# BlueJ files
52+
*.ctxt
8853

89-
# dated folders
90-
/19*
91-
/20*
54+
# Mobile Tools for Java (J2ME)
55+
.mtj.tmp/
9256

93-
# VS Code Java project files
94-
.project
95-
.vscode/
57+
# Package Files #
58+
*.war
59+
*.nar
60+
*.ear
61+
*.zip
62+
*.tar.gz
63+
*.rar
9664

97-
# Processing examples
98-
processing-examples
65+
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
66+
hs_err_pid*
67+
replay_pid*
9968

10069
# Maven ignores
10170
.kotlin
@@ -110,6 +79,62 @@ processing-examples
11079
/java/libraries/svg/bin
11180
/java/preprocessor/build
11281
/java/lsp/build
82+
### Gradle ###
83+
.gradle
84+
**/build/
85+
!src/**/build/
86+
87+
# Ignore Gradle GUI config
88+
gradle-app.setting
89+
90+
# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
91+
!gradle-wrapper.jar
92+
93+
# Avoid ignore Gradle wrappper properties
94+
!gradle-wrapper.properties
95+
96+
# Cache of project
97+
.gradletasknamecache
98+
99+
# Eclipse Gradle plugin generated files
100+
# Eclipse Core
101+
.project
102+
# JDT-specific (Eclipse Java Development Tools)
103+
.classpath
104+
105+
### Gradle Patch ###
106+
# Java heap dump
107+
108+
# End of https://www.toptal.com/developers/gitignore/api/android,gradle,java
109+
.DS_Store
110+
bin/*
111+
.build/
112+
.processing/
113+
library/*
114+
generated/
115+
!/build/
116+
!.idea/runConfigurations/
117+
!/java/application/launch4j/bin/*
118+
!java/libraries/io/library/**/*.so
119+
/app/lib
120+
/build/macos/work/Processing.app
121+
/core/library
122+
/core/bin
123+
/build/shared/tools/MovieMaker/tool/ffmpeg
124+
/build/shared/tools/MovieMaker/tool/*.jar
125+
/core/methods/methods.jar
126+
/java/libraries/*/library/*.jar
127+
/build/macos/*.tgz
128+
/build/shared/tools/MovieMaker/*.gz
129+
/app/bin/processing/app/laf/FlatLaf.properties
130+
/app/pde.jar
131+
/java/mode/gson.jar
132+
/java/mode/JavaMode.jar
133+
/java/mode/org.eclipse.lsp4j.jar
134+
/java/mode/org.eclipse.lsp4j.jsonrpc.jar
135+
!java/libraries/pdf/library/itext.jar
136+
!java/libraries/serial/library/jssc.jar
137+
/app/windows/obj
113138
/java/gradle/build
114139
/core/examples/build
115140
/java/gradle/example/.processing

.idea/.gitignore

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)