Apply common stream conventions plugins (#130)

Co-authored-by: Aleksandar Apostolov <[email protected]>
Co-authored-by: Petar Velikov <[email protected]>

Author: 3 people

.gitignore

@@ -1,18 +1,12 @@
 *.iml
 .gradle
 /local.properties
-/.idea/caches
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-/.idea/navEditor.xml
-/.idea/assetWizardSettings.xml
 .DS_Store
-/build
+**/build
 buildSrc/build
 /captures
 .externalNativeBuild
 .cxx
 local.properties
 .idea
-.kotlin
+.kotlin

build.gradle.kts

@@ -8,6 +8,8 @@ apply(from = "${rootDir}/gradle/scripts/sonar.gradle")
 
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
+    alias(libs.plugins.stream.android.library) apply false
+    alias(libs.plugins.stream.android.application) apply false
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.kotlin.android) apply false
     alias(libs.plugins.kotlin.compose) apply false

buildSrc/src/main/kotlin/io/getstream/feeds/android/Configuration.kt

@@ -16,10 +16,6 @@
 package io.getstream.feeds.android
 
 object Configuration {
-    const val compileSdk = 36
-    const val targetSdk = 36
-    const val sampleTargetSdk = 36
-    const val minSdk = 21
     const val majorVersion = 0
     const val minorVersion = 4
     const val patchVersion = 0

gradle/libs.versions.toml

@@ -1,4 +1,8 @@
 [versions]
+compileSdk = "36"
+targetSdk = "36"
+minSdk = "21"
+
 agp = "8.9.3"
 firebaseBom = "33.16.0"
 hilt = "2.57"
@@ -32,6 +36,7 @@ lifecycleProcess = "2.9.1"
 lifecycleViewModelCompose = "2.4.0"
 sonarqube = "6.0.1.5171"
 spotless = "7.2.1"
+streamConventions = "0.1.1"
 turbine = "1.2.1"
 kotlinDokka = "1.9.20"
 nexusPlugin = "1.3.0"
@@ -101,5 +106,7 @@ ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
 arturbosch-detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
 sonarqube = { id = "org.sonarqube", version.ref = "sonarqube" }
 spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }
+stream-android-library = { id = "io.getstream.android.library", version.ref = "streamConventions" }
+stream-android-application = { id = "io.getstream.android.application", version.ref = "streamConventions" }
 dokka = { id = "org.jetbrains.dokka", version.ref = "kotlinDokka" }
 nexus = { id = "io.github.gradle-nexus.publish-plugin", version.ref = "nexusPlugin" }

metrics/stream-feeds-android-metrics/build.gradle.kts

@@ -1,12 +1,17 @@
 plugins {
-    alias(libs.plugins.android.application)
+    alias(libs.plugins.stream.android.application)
     alias(libs.plugins.kotlin.android)
 }
 
-apply(from = "$rootDir/scripts/android.gradle")
-
 android {
     namespace = "io.getstream.feeds.android.metrics"
+    compileSdk = libs.versions.compileSdk.get().toInt()
+
+    defaultConfig {
+        minSdk = libs.versions.minSdk.get().toInt()
+        targetSdk = libs.versions.targetSdk.get().toInt()
+    }
+
     buildTypes {
         release {
             signingConfig = signingConfigs.findByName("debug")

scripts/android.gradle

@@ -86,7 +86,7 @@ afterEvaluate {
                         }
                         developer {
                             id = 'gpunto'
-                            name = 'Gianmarco'
+                            name = 'Gianmarco David'
                             email = '[email protected]'
                         }
                     }

scripts/publish-module.gradle

@@ -9,8 +9,10 @@ pluginManagement {
         }
         mavenCentral()
         gradlePluginPortal()
+        mavenLocal()
     }
 }
+
 dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
     repositories {

settings.gradle.kts

@@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    alias(libs.plugins.android.library)
+    alias(libs.plugins.stream.android.library)
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.ksp)
     alias(libs.plugins.arturbosch.detekt)
@@ -17,17 +17,20 @@ rootProject.extra.apply {
     set("PUBLISH_VERSION", rootProject.extra.get("rootVersionName"))
 }
 
-apply(from = "${rootDir}/scripts/publish-module.gradle")
-apply(from = "$rootDir/scripts/android.gradle")
+apply(from = "$rootDir/scripts/publish-module.gradle")
 
 android {
     namespace = "io.getstream.feeds.android.client"
+    compileSdk = libs.versions.compileSdk.get().toInt()
 
     buildFeatures {
         buildConfig = true
     }
 
     defaultConfig {
+        minSdk = libs.versions.minSdk.get().toInt()
+        testOptions.targetSdk = libs.versions.targetSdk.get().toInt()
+        lint.targetSdk = libs.versions.targetSdk.get().toInt()
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         buildConfigField("String", "PRODUCT_NAME", "\"stream-feeds-android\"")
         buildConfigField("String", "PRODUCT_VERSION", "\"${Configuration.versionName}\"")
@@ -38,7 +41,7 @@ android {
             isMinifyEnabled = false
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
+                "proguard-rules.pro",
             )
             consumerProguardFiles("consumer-rules.pro")
         }
@@ -62,7 +65,6 @@ tasks.withType<KotlinCompile>().configureEach {
                 "-opt-in=io.getstream.android.core.annotations.StreamInternalApi",
             ),
         )
-        jvmTarget.set(JvmTarget.JVM_11)
     }
 }
 

stream-feeds-android-client/build.gradle.kts

@@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    alias(libs.plugins.android.library)
+    alias(libs.plugins.stream.android.library)
     alias(libs.plugins.kotlin.android)
 }
 
@@ -13,22 +13,25 @@ rootProject.extra.apply {
     set("PUBLISH_VERSION", rootProject.extra.get("rootVersionName"))
 }
 
-apply(from = "${rootDir}/scripts/publish-module.gradle")
-apply(from = "$rootDir/scripts/android.gradle")
+apply(from = "$rootDir/scripts/publish-module.gradle")
 
 android {
     namespace = "io.getstream.feeds.android.network"
+    compileSdk = libs.versions.compileSdk.get().toInt()
 
     defaultConfig {
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        minSdk = libs.versions.minSdk.get().toInt()
+        testOptions.targetSdk = libs.versions.targetSdk.get().toInt()
+        lint.targetSdk = libs.versions.targetSdk.get().toInt()
     }
 
     buildTypes {
         release {
             isMinifyEnabled = false
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
+                "proguard-rules.pro",
             )
             consumerProguardFiles("consumer-rules.pro")
         }
@@ -50,7 +53,6 @@ tasks.withType<KotlinCompile>().configureEach {
                 "-Xexplicit-api=strict",
             ),
         )
-        jvmTarget.set(JvmTarget.JVM_11)
     }
 }