From 9eeca20bef8c7a12167bcca078d357c928ace85d Mon Sep 17 00:00:00 2001
From: Elie Gambache <elyahou.hadass@gmail.com>
Date: Sun, 15 Jun 2025 09:24:36 +0300
Subject: [PATCH 1/2] Refactor build scripts to adjust dependencies and remove
 unused common source sets

---
 generators/policies/build.gradle.kts | 16 +++++-----------
 generators/store/build.gradle.kts    | 18 ++++++------------
 2 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/generators/policies/build.gradle.kts b/generators/policies/build.gradle.kts
index 730bcb6..c4f2b2e 100644
--- a/generators/policies/build.gradle.kts
+++ b/generators/policies/build.gradle.kts
@@ -3,8 +3,6 @@ plugins {
     alias(libs.plugins.kotlinx.serialization)
 }
 
-group = "io.github.kdroidfilter.database"
-version = "1.0.0"
 
 kotlin {
     jvmToolchain(17)
@@ -13,26 +11,22 @@ kotlin {
 
 
     sourceSets {
-        commonMain.dependencies {
+        jvmMain.dependencies {
+            implementation(kotlin("test"))
+        }
+
+        jvmMain.dependencies {
             implementation(project(":core"))
             implementation(libs.kotlinx.coroutines.core)
             implementation(libs.kotlinx.coroutines.test)
             implementation(libs.kotlinx.serialization.json)
             implementation(libs.kermit)
             implementation(libs.platform.tools.release.fetcher)
-        }
-
-        commonTest.dependencies {
-            implementation(kotlin("test"))
-        }
-
-        jvmMain.dependencies {
             implementation(libs.kotlinx.coroutines.swing)
             implementation(libs.sqlite.jdbc)
             implementation(libs.maven.slf4j.provider)
         }
 
-
     }
 
     //https://kotlinlang.org/docs/native-objc-interop.html#export-of-kdoc-comments-to-generated-objective-c-headers
diff --git a/generators/store/build.gradle.kts b/generators/store/build.gradle.kts
index 6fcaf04..18632c6 100644
--- a/generators/store/build.gradle.kts
+++ b/generators/store/build.gradle.kts
@@ -3,17 +3,18 @@ plugins {
     alias(libs.plugins.kotlinx.serialization)
 }
 
-group = "io.github.kdroidfilter.database"
-version = "1.0.0"
 
 kotlin {
     jvmToolchain(17)
-
     jvm()
 
-
     sourceSets {
-        commonMain.dependencies {
+
+        jvmTest.dependencies {
+            implementation(kotlin("test"))
+        }
+
+        jvmMain.dependencies {
             implementation(project(":core"))
             implementation(libs.kotlinx.coroutines.core)
             implementation(libs.kotlinx.coroutines.test)
@@ -22,13 +23,6 @@ kotlin {
             implementation(libs.gplay.scrapper)
             implementation(libs.gplay.scrapper.core)
             implementation(libs.platform.tools.release.fetcher)
-        }
-
-        commonTest.dependencies {
-            implementation(kotlin("test"))
-        }
-
-        jvmMain.dependencies {
             implementation(libs.kotlinx.coroutines.swing)
             implementation(libs.sqlite.jdbc)
             implementation(libs.maven.slf4j.provider)

From 4f809486b465a4e241844caadba4f3adda8e81e4 Mon Sep 17 00:00:00 2001
From: Elie Gambache <elyahou.hadass@gmail.com>
Date: Sun, 15 Jun 2025 09:28:26 +0300
Subject: [PATCH 2/2] Remove `JsonExtractor` tests step from CI workflow

---
 .github/workflows/ci.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4f0375a..dfe2542 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -31,5 +31,3 @@ jobs:
       - name: Validate JSON policies
         run: ./gradlew :generators:policies:validateJson
 
-      - name: Run JsonExtractor tests
-        run: ./gradlew :generators:policies:cleanJvmTest :generators:policies:jvmTest --tests "io.github.kdroidfilter.database.generator.JsonExtractorTest"