Skip to content

Commit 00ce121

Browse files
authored
Merge branch 'core-maven' into main
2 parents 9e2500a + f67b34d commit 00ce121

File tree

6 files changed

+127
-2
lines changed

6 files changed

+127
-2
lines changed

.gitignore

+10-1
Original file line numberDiff line numberDiff line change
@@ -95,4 +95,13 @@ bin-test
9595
.vscode/
9696

9797
# Processing examples
98-
processing-examples
98+
processing-examples
99+
100+
# Maven ignores
101+
.gradle
102+
core/build/
103+
gradlew
104+
gradlew.bat
105+
gradle/wrapper/gradle-wrapper.properties
106+
gradle/wrapper/gradle-wrapper.jar
107+
build/publish/

core/.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,5 @@ bin-test
55
/library/jogl-all*.jar
66

77
core-sources.jar
8+
9+
different/build

core/build.gradle.kts

+71
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
import com.vanniktech.maven.publish.SonatypeHost
2+
3+
plugins {
4+
id("java")
5+
id("com.vanniktech.maven.publish") version "0.29.0"
6+
}
7+
8+
group = "org.processing.core"
9+
version = "4.3.1"
10+
11+
repositories {
12+
mavenCentral()
13+
maven { url = uri("https://jogamp.org/deployment/maven") }
14+
}
15+
16+
sourceSets{
17+
main{
18+
java{
19+
srcDirs("src/processing")
20+
}
21+
resources{
22+
srcDirs("src")
23+
exclude("**/*.java")
24+
}
25+
}
26+
}
27+
28+
dependencies {
29+
// TODO: Research on which jogl dependencies to include
30+
implementation("org.jogamp.gluegen:gluegen-rt:2.5.0")
31+
implementation("org.jogamp.jogl:jogl-all:2.5.0")
32+
33+
testImplementation("junit:junit:4.13.2")
34+
}
35+
36+
mavenPublishing{
37+
signAllPublications()
38+
publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL)
39+
40+
pom{
41+
name.set("Processing Core")
42+
description.set("Processing Core")
43+
url.set("https://processing.org")
44+
licenses {
45+
license {
46+
name.set("LGPL")
47+
url.set("https://www.gnu.org/licenses/lgpl-2.1.html")
48+
}
49+
}
50+
developers {
51+
developer {
52+
id.set("steftervelde")
53+
name.set("Stef Tervelde")
54+
}
55+
developer {
56+
id.set("benfry")
57+
name.set("Ben Fry")
58+
}
59+
}
60+
scm{
61+
url.set("https://github.com/processing/processing4-carbon-aug-19")
62+
connection.set("scm:git:git://github.com/processing/processing4-carbon-aug-19.git")
63+
developerConnection.set("scm:git:ssh://[email protected]/processing/processing4-carbon-aug-19.git")
64+
}
65+
}
66+
}
67+
68+
69+
tasks.test {
70+
useJUnit()
71+
}

core/different/build.gradle

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
import org.gradle.internal.jvm.Jvm
2+
3+
4+
plugins {
5+
id("objective-c")
6+
}
7+
8+
version = '1'
9+
10+
model{
11+
components {
12+
Different(NativeLibrarySpec) {
13+
sources {
14+
objc{
15+
source {
16+
srcDir "./"
17+
include "*.m"
18+
}
19+
}
20+
}
21+
binaries.all {
22+
def jvmHome = Jvm.current().javaHome
23+
24+
if (targetPlatform.operatingSystem.macOsX) {
25+
objcCompiler.args '-I', "${jvmHome}/include"
26+
objcCompiler.args '-I', "${jvmHome}/include/darwin"
27+
objcCompiler.args '-mmacosx-version-min=10.9'
28+
linker.args '-mmacosx-version-min=10.9'
29+
linker.args '-framework', 'AppKit'
30+
linker.args '-lobjc'
31+
}
32+
}
33+
}
34+
}
35+
}

core/different/different.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#import <AppKit/AppKit.h>
22
#import <Cocoa/Cocoa.h>
33
#import <JavaNativeFoundation/JavaNativeFoundation.h>
4-
4+
// #include <jni.h>
55

66
JNIEXPORT void JNICALL Java_processing_core_ThinkDifferent_hideMenuBar
77
(JNIEnv *env, jclass clazz, jboolean visible, jboolean kioskMode)

settings.gradle.kts

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
rootProject.name = "processing"
2+
include("core", "core:different")
3+
4+
buildscript {
5+
repositories {
6+
mavenCentral()
7+
}
8+
}

0 commit comments

Comments
 (0)