From 1b453bee238c153e6a192da771ee96f12df13568 Mon Sep 17 00:00:00 2001
From: marcprux <mwp1@cornell.edu>
Date: Mon, 5 Feb 2024 16:31:16 -0500
Subject: [PATCH] Use gradle version catalogs for dependencies

---
 CHANGELOG.md                  |  9 +++++++++
 Package.swift                 |  4 ++--
 Sources/SkipFFI/Skip/skip.yml | 21 +++++++++++++++++++--
 3 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c2bde44..841e1d7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+## 0.3.0
+
+Released 2024-02-05
+
+  - Update platform check test case
+  - Update platform checks
+  - Add mention about local and instrumented testing to README
+  - Update docs to point to the skip-c-demo sample
+
 ## 0.2.4
 
 Released 2023-12-31
diff --git a/Package.swift b/Package.swift
index 9f0938c..1a43a82 100644
--- a/Package.swift
+++ b/Package.swift
@@ -9,8 +9,8 @@ let package = Package(
         .library(name: "SkipFFI", targets: ["SkipFFI"]),
     ],
     dependencies: [
-        .package(url: "https://source.skip.tools/skip.git", from: "0.7.40"),
-        .package(url: "https://source.skip.tools/skip-foundation.git", from: "0.3.11")
+        .package(url: "https://source.skip.tools/skip.git", from: "0.8.0"),
+        .package(url: "https://source.skip.tools/skip-foundation.git", from: "0.5.0")
     ],
     targets: [
         .target(name: "SkipFFI", dependencies: [.product(name: "SkipFoundation", package: "skip-foundation")], plugins: [.plugin(name: "skipstone", package: "skip")]),
diff --git a/Sources/SkipFFI/Skip/skip.yml b/Sources/SkipFFI/Skip/skip.yml
index 87f2d45..59af4bf 100644
--- a/Sources/SkipFFI/Skip/skip.yml
+++ b/Sources/SkipFFI/Skip/skip.yml
@@ -1,9 +1,26 @@
 # Configuration file for https://skip.tools project
 #
 # Kotlin dependencies and Gradle build options for this module can be configured here
+
+# the blocks to add to the settings.gradle.kts
+settings:
+  contents:
+    - block: 'dependencyResolutionManagement'
+      contents:
+        - block: 'versionCatalogs'
+          contents:
+            - block: 'create("libs")'
+              contents:
+                - 'version("jna", "5.14.0")'
+                - 'library("jna", "net.java.dev.jna", "jna").versionRef("jna")'
+
+# the blocks to add to the build.gradle.kts
 build:
   contents:
+    - block: 'dependencies'
+      export: false
+      contents:
+        - 'api(libs.jna) { artifact { type = "aar" } }'
     - block: 'dependencies'
       contents:
-        - 'implementation("net.java.dev.jna:jna:5.13.0@aar")'
-        - 'testImplementation("net.java.dev.jna:jna:5.13.0")'
+        - 'testImplementation(libs.jna)'