Repositories / ocaml-git.git

ocaml-git.git

Clone (read-only): git clone http://git.guha-anderson.com/git/ocaml-git.git

Branch

Set up Gradle build system for Kotlin/Native project

- Added `build.gradle.kts` for Kotlin Multiplatform configuration targeting `linuxX64`.
- Introduced `gradle.properties` for Kotlin code style and target settings.
- Created `settings.gradle.kts` for project structure and dependency management.
- Updated `README.md` to reflect Gradle build commands instead of Makefile.
- Added Gradle wrapper files for consistent build environment.
- Cleaned up `.gitignore` to include Gradle-related files.
Author
Arjun Guha <a.guha@northeastern.edu>
Date
2026-04-19 17:00:19 -0400
Commit
319ff62a126649877c1e735154a352f5b555c1e1
.gitignore
index 849d932..c914818 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
+.gradle/
 .build/
 build/
 *.kexe
 *.klib
 .kotlin/
-
Makefile
index cee2c4c..f89c6fb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,52 +1,16 @@
-KOTLIN_HOME ?= /home/arjun/.local/opt/kotlin
-KONANC := $(KOTLIN_HOME)/bin/konanc
-CINTEROP := $(KOTLIN_HOME)/bin/cinterop
-PKG_CONFIG ?= pkg-config
-TARGET ?= linux_x64
+.PHONY: all build test clean fixture
 
-BUILD_DIR := .build
-INTEROP_KLIB := $(BUILD_DIR)/klib/libgit2.klib
-LIB_KLIB := $(BUILD_DIR)/klib/kotlin-git.klib
-TEST_BIN := $(BUILD_DIR)/bin/kotlin-git-tests.kexe
-LIBGIT2_INCLUDE_DIR := $(shell $(PKG_CONFIG) --variable=includedir libgit2 2>/dev/null)
-LIBGIT2_LIB_DIR := $(shell $(PKG_CONFIG) --variable=libdir libgit2 2>/dev/null)
-LIBGIT2_CFLAGS := $(shell $(PKG_CONFIG) --cflags libgit2 2>/dev/null)
-LIBGIT2_LIBS := $(shell $(PKG_CONFIG) --libs libgit2 2>/dev/null)
+all: build
 
-MAIN_SOURCES := $(shell find src/main/kotlin -name '*.kt' | sort)
-TEST_SOURCES := $(shell find src/test/kotlin -name '*.kt' | sort)
+build:
+	./gradlew build
 
-.PHONY: all check-system-libgit2 interop test clean fixture
+test:
+	./gradlew test
 
-all: $(LIB_KLIB)
-
-check-system-libgit2:
-	$(PKG_CONFIG) --exists libgit2
-
-$(INTEROP_KLIB): src/nativeInterop/cinterop/libgit2.def | check-system-libgit2
-	mkdir -p $(dir $@)
-	$(CINTEROP) -target $(TARGET) -def $< -o $(BUILD_DIR)/klib/libgit2 \
-		-libraryPath $(LIBGIT2_LIB_DIR) \
-		-compiler-option -I$(LIBGIT2_INCLUDE_DIR) \
-		$(foreach flag,$(LIBGIT2_CFLAGS),-compiler-option $(flag))
-
-$(LIB_KLIB): $(MAIN_SOURCES) $(INTEROP_KLIB)
-	mkdir -p $(dir $@)
-	$(KONANC) -target $(TARGET) -produce library -o $(BUILD_DIR)/klib/kotlin-git \
-		-library $(INTEROP_KLIB) $(MAIN_SOURCES)
-
-$(TEST_BIN): $(TEST_SOURCES) $(LIB_KLIB) fixtures/demo-repo.tar.gz
-	mkdir -p $(dir $@)
-	$(KONANC) -target $(TARGET) -o $(BUILD_DIR)/bin/kotlin-git-tests \
-		-library $(INTEROP_KLIB) -library $(LIB_KLIB) $(TEST_SOURCES) \
-		-linker-option -L$(LIBGIT2_LIB_DIR) \
-		$(foreach flag,$(LIBGIT2_LIBS),-linker-option $(flag))
-
-test: $(TEST_BIN)
-	$(TEST_BIN)
+clean:
+	./gradlew clean
+	rm -rf .build
 
 fixture:
 	scripts/create-demo-fixture.sh
-
-clean:
-	rm -rf $(BUILD_DIR)
README.md
index 25b16af..0dad072 100644
--- a/README.md
+++ b/README.md
@@ -8,20 +8,24 @@ surface.
 
 ## Requirements
 
-- Kotlin/Native installed at `/home/arjun/.local/opt/kotlin`
+- JDK 17 or newer for Gradle
 - system libgit2 headers and library visible through `pkg-config libgit2`
-- `make`, `tar`, `git`
+- `tar`, `git`
 
 ## Build
 
 ```sh
-make
+./gradlew build
 ```
 
+This project uses the Kotlin Multiplatform Gradle plugin with only a
+Kotlin/Native `linuxX64` target configured. It does not configure or produce a
+JVM target.
+
 ## Test
 
 ```sh
-make test
+./gradlew test
 ```
 
 The test executable unpacks `fixtures/demo-repo.tar.gz` into `.build/test-work`
build.gradle.kts
new file mode 100644
index 0000000..bbbb7a9
--- /dev/null
+++ b/build.gradle.kts
@@ -0,0 +1,97 @@
+import org.gradle.language.base.plugins.LifecycleBasePlugin
+
+plugins {
+    kotlin("multiplatform") version "2.3.20"
+}
+
+group = "kotlinx.git"
+version = "0.1.0-SNAPSHOT"
+
+fun pkgConfig(vararg args: String): List<String> {
+    val output = providers.exec {
+        commandLine("pkg-config", *args, "libgit2")
+    }.standardOutput.asText.get()
+
+    return output
+        .trim()
+        .split(Regex("\\s+"))
+        .filter { it.isNotBlank() }
+}
+
+fun pkgConfigValue(variable: String): String {
+    return providers.exec {
+        commandLine("pkg-config", "--variable=$variable", "libgit2")
+    }.standardOutput.asText.get().trim()
+}
+
+val libgit2CFlags = pkgConfig("--cflags")
+val libgit2IncludeDir = pkgConfigValue("includedir")
+val libgit2Libs = pkgConfig("--libs")
+val libgit2LibDir = pkgConfigValue("libdir")
+
+kotlin {
+    linuxX64 {
+        compilations.getByName("main") {
+            cinterops {
+                val libgit2 by creating {
+                    defFile(project.file("src/nativeInterop/cinterop/libgit2.def"))
+                    compilerOpts(libgit2CFlags)
+                    if (libgit2IncludeDir.isNotBlank()) {
+                        compilerOpts("-I$libgit2IncludeDir")
+                    }
+                    if (libgit2LibDir.isNotBlank()) {
+                        extraOpts("-libraryPath", libgit2LibDir)
+                    }
+                }
+            }
+        }
+
+        binaries.all {
+            if (libgit2LibDir.isNotBlank()) {
+                linkerOpts("-L$libgit2LibDir")
+            }
+            linkerOpts(libgit2Libs)
+        }
+
+        binaries.executable("tests") {
+            compilation = compilations.getByName("test")
+            baseName = "kotlin-git-tests"
+            entryPoint = "main"
+        }
+
+        tasks.register<Exec>("nativeTest") {
+            group = LifecycleBasePlugin.VERIFICATION_GROUP
+            description = "Runs the Kotlin/Native test executable."
+            dependsOn("linkTestsDebugExecutableLinuxX64")
+            workingDir = rootProject.projectDir
+            executable = layout.buildDirectory
+                .file("bin/linuxX64/testsDebugExecutable/kotlin-git-tests.kexe")
+                .get()
+                .asFile
+                .absolutePath
+        }
+    }
+
+    sourceSets {
+        val linuxX64Main by getting {
+            kotlin.srcDir("src/main/kotlin")
+        }
+        val linuxX64Test by getting {
+            kotlin.srcDir("src/test/kotlin")
+        }
+    }
+}
+
+tasks.register("test") {
+    group = LifecycleBasePlugin.VERIFICATION_GROUP
+    description = "Runs all tests."
+    dependsOn("nativeTest")
+}
+
+tasks.named("linuxX64Test") {
+    enabled = false
+}
+
+tasks.named("check") {
+    dependsOn("nativeTest")
+}
gradle.properties
new file mode 100644
index 0000000..e939bec
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,2 @@
+kotlin.code.style=official
+kotlin.native.ignoreDisabledTargets=true
gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..61285a6
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ
gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..19a6bde
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,7 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
gradlew
new file mode 100755
index 0000000..adff685
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,248 @@
+#!/bin/sh
+
+#
+# Copyright © 2015 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+##############################################################################
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
+        "$@"
+
+# 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.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"
settings.gradle.kts
new file mode 100644
index 0000000..7d20ed2
--- /dev/null
+++ b/settings.gradle.kts
@@ -0,0 +1,15 @@
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        mavenCentral()
+    }
+}
+
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        mavenCentral()
+    }
+}
+
+rootProject.name = "kotlin-git"