Merge branch 'develop'

DesarrolloAntonio · Nov 26, 2024 · a8d528e · a8d528e
2 parents fba771b + f989f3a
commit a8d528e
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -36,6 +36,7 @@ jobs:
           script: ./gradlew connectedDebugAndroidTest
 
   build_and_release:
+    if: github.ref == 'refs/heads/master'
     runs-on: ubuntu-latest
     needs: [unit_tests, android_tests]
     steps:

diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -1,7 +1,6 @@
 plugins {
     id("com.android.library")
     id ("org.jetbrains.kotlin.android")
-    id ("kotlin-kapt")
 }
 
 android {

diff --git a/domain/build.gradle.kts b/domain/build.gradle.kts
@@ -1,15 +1,14 @@
 plugins {
     id("com.android.library")
     id ("org.jetbrains.kotlin.android")
-    id ("kotlin-kapt")
 }
 
 android {
     namespace = "com.desarrollodroide.domain"
     compileSdk = (findProperty("compileSdkVersion") as String).toInt()
 
     defaultConfig {
-        minSdk = 21
+        minSdk = (findProperty("minSdkVersion") as String).toInt()
         targetSdk = (findProperty("targetSdkVersion") as String).toInt()
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

diff --git a/model/build.gradle.kts b/model/build.gradle.kts
@@ -1,7 +1,6 @@
 plugins {
     id("com.android.library")
     id ("org.jetbrains.kotlin.android")
-    id ("kotlin-kapt")
 }
 
 android {