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

---
 CHANGELOG.md                           |  6 ++++++
 Package.swift                          |  6 +++---
 Sources/SkipFirebaseCore/Skip/skip.yml | 13 ++++++++++++-
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index efbcf14..412adbb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 0.1.0
+
+Released 2024-02-05
+
+  - Work-around test failures with multiple FirebaseApp instances
+
 ## 0.0.3
 
 Released 2024-01-09
diff --git a/Package.swift b/Package.swift
index bd457a0..f6ad557 100644
--- a/Package.swift
+++ b/Package.swift
@@ -27,9 +27,9 @@ let package = Package(
         .library(name: "SkipFirebaseStorage", targets: ["SkipFirebaseStorage"]),
     ],
     dependencies: [
-        .package(url: "https://source.skip.tools/skip.git", from: "0.7.42"),
-        .package(url: "https://source.skip.tools/skip-foundation.git", from: "0.4.0"),
-        .package(url: "https://source.skip.tools/skip-model.git", from: "0.4.0"),
+        .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"),
+        .package(url: "https://source.skip.tools/skip-model.git", from: "0.5.0"),
         .package(url: "https://github.com/firebase/firebase-ios-sdk.git", from: "10.17.0")
     ],
     targets: [
diff --git a/Sources/SkipFirebaseCore/Skip/skip.yml b/Sources/SkipFirebaseCore/Skip/skip.yml
index c2fbafa..9565bcd 100644
--- a/Sources/SkipFirebaseCore/Skip/skip.yml
+++ b/Sources/SkipFirebaseCore/Skip/skip.yml
@@ -1,10 +1,21 @@
 # Configuration file for https://skip.tools project
 #
 # Kotlin dependencies and Gradle build options for this module can be configured here
+settings:
+  contents:
+    - block: 'dependencyResolutionManagement'
+      contents:
+        - block: 'versionCatalogs'
+          contents:
+            - block: 'create("libs")'
+              contents:
+                - 'version("firebase", "32.7.1")'
+                - 'library("firebase-bom", "com.google.firebase", "firebase-bom").versionRef("firebase")'
+
 build:
   contents:
     - block: 'dependencies'
       contents:
-        - 'implementation(platform("com.google.firebase:firebase-bom:32.7.0"))'
+        - 'implementation(platform(libs.firebase.bom))'
         - 'implementation("com.google.firebase:firebase-installations")'
         - 'implementation("org.jetbrains.kotlinx:kotlinx-coroutines-play-services")'