🏗️ change project structure

aemogie · aemogie · commit e31bae288437 · 2022-09-15T15:35:48.000+05:30
(and upgrade gradle)

Signed-off-by: aemogie &lt;54412618+aemogie@users.noreply.github.com&gt;
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 }
 
 tasks.wrapper {
-	gradleVersion = "7.5"
+	gradleVersion = "7.5.1"
 	distributionType = Wrapper.DistributionType.ALL
 }
 
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -1,3 +1,3 @@
-plugins { kotlin("jvm") version "1.7.0" }
+plugins { kotlin("jvm") version "1.7.10" }
 
 repositories { mavenCentral() }
diff --git a/buildSrc/src/main/kotlin/LWJGL.kt b/buildSrc/src/main/kotlin/LWJGL.kt
@@ -1,20 +1,49 @@
 import org.gradle.api.artifacts.MinimalExternalModuleDependency
 import org.gradle.api.artifacts.dsl.DependencyHandler
 import org.gradle.api.provider.Provider
+import org.gradle.internal.os.OperatingSystem
 
-private val nativeClassifiers = arrayOf(
-	"natives-linux",
-	"natives-linux-arm64",
-	"natives-linux-arm32",
-	"natives-macos",
-	"natives-macos-arm64",
-	"natives-windows",
-	"natives-windows-arm64",
-	"natives-windows-x86",
-)
+object LWJGL {
+	var allNatives = true
 
-fun DependencyHandler.allLwjglNatives(
-	dependency: Provider<MinimalExternalModuleDependency>
-) = nativeClassifiers.map { native ->
-	variantOf(dependency) { it.classifier(native) }
+	var current = Pair(
+		OperatingSystem.current(), System.getProperty("os.arch")
+	).let { (os, arch) ->
+		when {
+			os.isMacOsX -> if (arch.startsWith("aarch64")) "natives-macos-arm64" else "natives-macos"
+			os.isLinux || (os.isUnix && !os.isMacOsX) -> { // linux, solaris and freebsd
+				if (arch.startsWith("arm") || arch.startsWith("aarch64")) {
+					if (arch.contains("64") || arch.startsWith("armv8")) "natives-linux-arm64"
+					else "natives-linux-arm32"
+				} else "natives-linux"
+			}
+			os.isWindows -> {
+				if (arch.contains("64")) {
+					if (arch.startsWith("aarch64")) "natives-windows-arm64" else "natives-windows"
+				} else "natives-windows-x86"
+			}
+			else -> error("Unrecognized or unsupported platform. Please set \"LWJGL.current\" manually")
+		}
+	}
+
+	internal val classifiers = arrayOf(
+		"natives-linux",
+		"natives-linux-arm64",
+		"natives-linux-arm32",
+		"natives-macos",
+		"natives-macos-arm64",
+		"natives-windows",
+		"natives-windows-arm64",
+		"natives-windows-x86",
+	)
+}
+
+fun DependencyHandler.lwjglNatives(dependency: Provider<MinimalExternalModuleDependency>) {
+	if (LWJGL.allNatives) {
+		LWJGL.classifiers.map { native ->
+			variantOf(dependency) { it.classifier(native) }
+		}.forEach { add("runtimeOnly", it) }
+	} else {
+		add("runtimeOnly", variantOf(dependency) { it.classifier(LWJGL.current) })
+	}
 }
diff --git a/demo/build.gradle.kts b/demo/build.gradle.kts
@@ -9,6 +9,5 @@ tasks.jar {
 
 dependencies {
 	implementation(projects.utils)
-	implementation(projects.graphics.gl)
-	implementation(projects.ui)
+	implementation(projects.gl)
 }
diff --git a/gl/build.gradle.kts b/gl/build.gradle.kts
@@ -1,7 +1,9 @@
 dependencies {
+	api(projects.graphics)
+
 	implementation(projects.utils)
 	with(libs.lwjgl) {
 		api(opengl)
-		allLwjglNatives(opengl).forEach(::runtimeOnly)
+		lwjglNatives(opengl)
 	}
 }
diff --git a/gl/src/main/java/io/github/aemogie/timble/gl/OpenGL.kt b/gl/src/main/java/io/github/aemogie/timble/gl/OpenGL.kt
diff --git a/gl/src/main/java/io/github/aemogie/timble/gl/utils/Debug.kt b/gl/src/main/java/io/github/aemogie/timble/gl/utils/Debug.kt
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-kotlin = "1.7.0"
+kotlin = "1.7.10"
 shadow = "7.1.2"
 
 lwjgl = "3.3.1"
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -205,6 +205,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.
diff --git a/gradlew.bat b/gradlew.bat
@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
diff --git a/graphics/build.gradle.kts b/graphics/build.gradle.kts
@@ -6,14 +6,10 @@ dependencies {
 		api(glfw)
 		api(openal)
 		api(stb)
-		allLwjglNatives(core).forEach(::runtimeOnly)
-		allLwjglNatives(assimp).forEach(::runtimeOnly)
-		allLwjglNatives(glfw).forEach(::runtimeOnly)
-		allLwjglNatives(openal).forEach(::runtimeOnly)
-		allLwjglNatives(stb).forEach(::runtimeOnly)
+		lwjglNatives(core)
+		lwjglNatives(assimp)
+		lwjglNatives(glfw)
+		lwjglNatives(openal)
+		lwjglNatives(stb)
 	}
-}
-
-project.also { parent ->
-	subprojects { dependencies { api(parent) } }
 }
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -5,6 +5,4 @@ dependencyResolutionManagement {
 	@Suppress("UnstableApiUsage") repositories { mavenCentral() }
 }
 
-include("utils", "graphics", "ui")
-include("graphics:gl")
-include("demo")
+include("utils", "graphics", "gl", "demo")
diff --git a/ui/build.gradle.kts b/ui/build.gradle.kts

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ plugins {`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`tasks.wrapper {`
`7`		`- gradleVersion = "7.5"`
	`7`	`+ gradleVersion = "7.5.1"`
`8`	`8`	`distributionType = Wrapper.DistributionType.ALL`
`9`	`9`	`}`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`-plugins { kotlin("jvm") version "1.7.0" }`
	`1`	`+plugins { kotlin("jvm") version "1.7.10" }`
`2`	`2`
`3`	`3`	`repositories { mavenCentral() }`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,5 @@ tasks.jar {`
`9`	`9`
`10`	`10`	`dependencies {`
`11`	`11`	`implementation(projects.utils)`
`12`		`- implementation(projects.graphics.gl)`
`13`		`- implementation(projects.ui)`
	`12`	`+ implementation(projects.gl)`
`14`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,9 @@`
`1`	`1`	`dependencies {`
	`2`	`+ api(projects.graphics)`
	`3`	`+`
`2`	`4`	`implementation(projects.utils)`
`3`	`5`	`with(libs.lwjgl) {`
`4`	`6`	`api(opengl)`
`5`		`- allLwjglNatives(opengl).forEach(::runtimeOnly)`
	`7`	`+ lwjglNatives(opengl)`
`6`	`8`	`}`
`7`	`9`	`}`