Revert up to "SampleApp: Add keystore files"

Revert "Build: Separate plugin and sampleapp build steps"

This reverts commit b7a61bd.

Revert "SampleApp: Update proguardFiles configuration"

This reverts commit 36320a2.

Revert "Build: Do not include plugin module in root project"

This reverts commit 0c31335.

Author: burakaygun

.github/workflows/build.yml

@@ -31,15 +31,10 @@ jobs:
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
 
-      - name: Run plugin build with caching enabled
+      - name: Run build with caching enabled
         uses: gradle/[email protected]
         with:
-          arguments: :secretsvaultplugin:clean :secretsvaultplugin:build -s
+          arguments: clean build -s
 
-      - name: Run Detekt for plugin
-        run: ./gradlew :secretsvaultplugin:detektMain
-
-      - name: Run sampleapp build with caching enabled
-        uses: gradle/[email protected]
-        with:
-          arguments: :sampleapp:clean :sampleapp:build -s
+      - name: Run Detekt
+        run: ./gradlew detektMain

build.gradle.kts

@@ -1,16 +1,10 @@
 plugins {
+    alias(libs.plugins.kotlin.jvm).apply(false)
+    alias(libs.plugins.gradle.publish).apply(false)
+    alias(libs.plugins.detekt).apply(false)
+    alias(libs.plugins.kotlin.serialization).apply(false)
+
+    // Sample App
     alias(libs.plugins.android.application).apply(false)
     alias(libs.plugins.kotlin.android).apply(false)
 }
-
-tasks.register("build") {
-    gradle.includedBuilds.forEach {
-        dependsOn(it.task(":build"))
-    }
-}
-
-tasks.register("clean") {
-    gradle.includedBuilds.forEach {
-        dependsOn(it.task(":clean"))
-    }
-}

sampleapp/build.gradle.kts

@@ -44,7 +44,8 @@ android {
             signingConfig = signingConfigs.getByName("release")
             isMinifyEnabled = true
             proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt")
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
             )
         }
     }

settings.gradle.kts

@@ -1,5 +1,7 @@
 pluginManagement {
-    includeBuild("secretsvaultplugin")
+    includeBuild("secretsvaultplugin") {
+        name = "secretsvaultplugin_included"
+    }
     repositories {
         google()
         mavenCentral()
@@ -17,3 +19,4 @@ dependencyResolutionManagement {
 rootProject.name = "Secrets Vault Plugin"
 
 include(":sampleapp")
+include(":secretsvaultplugin")