build: disable automatic component creation

tynn-xyz · May 26, 2022 · c5c246b · c5c246b
1 parent 1551817
commit c5c246b
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 20 deletions.
diff --git a/android.gradle b/android.gradle
@@ -1,9 +1,9 @@
 android {
-    compileSdkVersion 31
+    compileSdkVersion 32
 
     defaultConfig {
         minSdkVersion 19
-        targetSdkVersion 31
+        targetSdkVersion 32
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 }
diff --git a/bom/build.gradle b/bom/build.gradle
@@ -14,11 +14,3 @@ dependencies {
         }
     }
 }
-
-publishing {
-    publications {
-        release(MavenPublication) {
-            from components.javaPlatform
-        }
-    }
-}
diff --git a/build.gradle b/build.gradle
@@ -2,7 +2,6 @@ plugins {
     id 'com.android.library' version '7.2.0' apply false
     id 'org.jetbrains.kotlin.android' version '1.6.21' apply false
     id 'io.github.gradle-nexus.publish-plugin' version '1.1.0'
-    id 'xyz.tynn.android.maven' version '0.2.1' apply false
     id 'com.github.ben-manes.versions' version '0.42.0'
 }
 
@@ -13,14 +12,14 @@ allprojects {
 }
 
 subprojects {
-    pluginManager.withPlugin('com.android.library') {
-        apply plugin: 'org.jetbrains.kotlin.android'
+    pluginManager.withPlugin('com.android.application') {
         apply from: "$rootDir/android.gradle"
-        apply from: "$rootDir/library.gradle"
     }
 
-    pluginManager.withPlugin('com.android.application') {
+    pluginManager.withPlugin('com.android.library') {
+        apply plugin: 'org.jetbrains.kotlin.android'
         apply from: "$rootDir/android.gradle"
+        apply from: "$rootDir/library.gradle"
     }
 
     pluginManager.withPlugin('maven-publish') {

diff --git a/gradle.properties b/gradle.properties
@@ -1,3 +1,4 @@
+android.disableAutomaticComponentCreation=true
 android.useAndroidX=true
 kotlin.code.style=official
 org.gradle.jvmargs=-Xmx2048m
diff --git a/library.gradle b/library.gradle
@@ -1,7 +1,11 @@
 android {
-    libraryVariants.all {
-        it.generateBuildConfigProvider.configure {
-            enabled = false
+    buildFeatures {
+        buildConfig false
+    }
+
+    publishing {
+        singleVariant('release') {
+            withSourcesJar()
         }
     }
 }

diff --git a/publishing.gradle b/publishing.gradle
@@ -1,8 +1,17 @@
 if (project != rootProject) publishing {
-    apply plugin: 'xyz.tynn.android.maven'
-    apply plugin: 'xyz.tynn.android.sources'
     apply plugin: 'signing'
 
+    publishing {
+        publications {
+            release(MavenPublication) {
+                afterEvaluate {
+                    from components.findByName('javaPlatform')
+                            ?: components.findByName('release')
+                }
+            }
+        }
+    }
+
     signing {
         final signingKey = System.env.SIGNING_KEY
         final signingPassword = System.env.SIGNING_PASSWORD