From f285cf8c6a24c9d9383c07627c7c99ee0f512aac Mon Sep 17 00:00:00 2001
From: Matt Landers <matt@mattlanders.com>
Date: Wed, 29 Apr 2026 07:49:44 -0500
Subject: [PATCH 1/2] added skills for adk

---
 .gitignore       |  1 +
 pyproject.toml   |  4 ++++
 skills-lock.json | 35 +++++++++++++++++++++++++++++++++++
 3 files changed, 40 insertions(+)
 create mode 100644 skills-lock.json

diff --git a/.gitignore b/.gitignore
index c8342a2..693b25a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -66,3 +66,4 @@ system_tests/local_test_setup
 pylintrc
 pylintrc.test
 
+.agents/skills
\ No newline at end of file
diff --git a/pyproject.toml b/pyproject.toml
index 20ef7e3..8e3cb33 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -12,7 +12,11 @@ dependencies = [
     "google-analytics-admin==0.28.0",
     "google-auth~=2.40",
     "mcp>=1.24.0",
+<<<<<<< Updated upstream
     "google-adk>=1.28.1",
+=======
+    "google-adk>=1.29.0",
+>>>>>>> Stashed changes
     "httpx>=0.28.1",
 ]
 keywords = ["google analytics", "analytics", "mcp", "ga4"]
diff --git a/skills-lock.json b/skills-lock.json
new file mode 100644
index 0000000..85e5666
--- /dev/null
+++ b/skills-lock.json
@@ -0,0 +1,35 @@
+{
+  "version": 1,
+  "skills": {
+    "adk-cheatsheet": {
+      "source": "google/adk-docs",
+      "sourceType": "github",
+      "computedHash": "79b12ecfef6421e592bf0e1a1fcb73548cc1d714ff0b7e619668d1d6b8b0faa8"
+    },
+    "adk-deploy-guide": {
+      "source": "google/adk-docs",
+      "sourceType": "github",
+      "computedHash": "cd9cb294edbae34148ca6e9d5c4b046ae627df037b8a8b8d4b330ff6a808c9e9"
+    },
+    "adk-dev-guide": {
+      "source": "google/adk-docs",
+      "sourceType": "github",
+      "computedHash": "82998a543795ede788f66f2243828b48ae5e0b6695e7a19d900bf4153c5fde46"
+    },
+    "adk-eval-guide": {
+      "source": "google/adk-docs",
+      "sourceType": "github",
+      "computedHash": "bab60302ffc684ad0d2244fde82849f973c3398598052f4c80918dd9d33770e8"
+    },
+    "adk-observability-guide": {
+      "source": "google/adk-docs",
+      "sourceType": "github",
+      "computedHash": "abe282356ebeeb67ec04a30e59539b069cf2a3bb5b0bd28d7dc9932523c07422"
+    },
+    "adk-scaffold": {
+      "source": "google/adk-docs",
+      "sourceType": "github",
+      "computedHash": "644a2eecc3eb84a8c4d0b45d0b897fed8ea5b3877f9746c008528fa500b1fb51"
+    }
+  }
+}

From ef5f6319b17785fe5e3b0f5eff3b194a05374124 Mon Sep 17 00:00:00 2001
From: Matt Landers <matt@mattlanders.com>
Date: Wed, 29 Apr 2026 07:56:45 -0500
Subject: [PATCH 2/2] fix: resolve merge conflict in pyproject.toml

---
 pyproject.toml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 8e3cb33..b0d2af0 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -12,11 +12,7 @@ dependencies = [
     "google-analytics-admin==0.28.0",
     "google-auth~=2.40",
     "mcp>=1.24.0",
-<<<<<<< Updated upstream
-    "google-adk>=1.28.1",
-=======
     "google-adk>=1.29.0",
->>>>>>> Stashed changes
     "httpx>=0.28.1",
 ]
 keywords = ["google analytics", "analytics", "mcp", "ga4"]