♻organize build.gradle

.editorconfig

@@ -10,5 +10,8 @@ insert_final_newline = true
 [*.json]
 indent_size = 2
 
+[*.md]
+trim_trailing_whitespace = false
+
 [{*.yml,*.yaml}]
 indent_size = 2

build.gradle.kts

@@ -5,9 +5,9 @@ buildscript {
     }
     dependencies {
         classpath("com.android.tools.build:gradle:4.1.2")
-        classpath(kotlin("gradle-plugin", version = "1.4.21"))
+        classpath(kotlin("gradle-plugin", version = "1.4.30"))
         classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.4.20")
-        classpath("androidx.navigation:navigation-safe-args-gradle-plugin:2.3.2")
+        classpath("androidx.navigation:navigation-safe-args-gradle-plugin:2.3.3")
 
         classpath("com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5")
         classpath("com.github.ben-manes:gradle-versions-plugin:0.36.0")

buildSrc/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    kotlin("jvm") version "1.4.21"
+    kotlin("jvm") version "1.4.30"
     `kotlin-dsl`
 }
 

buildSrc/src/main/java/build/internal/Bintray.kt → buildSrc/src/main/java/build/Bintray.kt

@@ -1,6 +1,5 @@
-package build.internal
+package build
 
-import build.ProjectProperties
 import com.jfrog.bintray.gradle.BintrayExtension
 import org.gradle.api.Project
 import org.gradle.api.internal.HasConvention
@@ -15,7 +14,7 @@ private fun Project.bintray(configure: BintrayExtension.() -> Unit): Unit =
 private val Project.base: BasePluginConvention
     get() = ((this as? Project)?.convention ?: (this as HasConvention).convention).getPluginByName("base")
 
-internal fun Project.bintraySettings() {
+fun Project.bintraySettings() {
     bintray {
         user = project.findProperty("bintray_user") as? String ?: ""
         key = project.findProperty("bintray_key") as? String ?: ""

buildSrc/src/main/java/build/internal/DependencyUpdates.kt → buildSrc/src/main/java/build/DependencyUpdates.kt

@@ -1,10 +1,10 @@
-package build.internal
+package build
 
 import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.named
 
-internal fun Project.dependencyUpdatesSettings() {
+fun Project.dependencyUpdatesSettings() {
     tasks.named<DependencyUpdatesTask>("dependencyUpdates").configure {
         rejectVersionIf { !isStable(candidate.version) }
     }

buildSrc/src/main/java/build/internal/Publishing.kt → buildSrc/src/main/java/build/Publishing.kt

@@ -1,6 +1,5 @@
-package build.internal
+package build
 
-import build.ProjectProperties
 import groovy.util.Node
 import org.gradle.api.NamedDomainObjectContainer
 import org.gradle.api.NamedDomainObjectProvider
@@ -29,25 +28,27 @@ private val NamedDomainObjectContainer<Configuration>.api: NamedDomainObjectProv
 private val NamedDomainObjectContainer<Configuration>.implementation: NamedDomainObjectProvider<Configuration>
     get() = named<Configuration>("implementation")
 
-internal fun Project.publishingSettings() {
+fun Project.publishingSettings() {
     publishing {
         publications {
             create<MavenPublication>("bintray") {
                 artifact("$buildDir/outputs/aar/${base.archivesBaseName}-release.aar")
+                artifact(tasks["sourcesJar"])
                 groupId = ProjectProperties.groupId
                 artifactId = base.archivesBaseName
                 version = ProjectProperties.versionName
-                artifact(tasks["sourcesJar"])
                 pom.withXml {
                     val node = asNode()
-                    val licenses = node.appendNode("licenses")
-                    appendLicense(
-                        licenses,
-                        "The MIT License",
-                        "https://opensource.org/licenses/MIT",
-                        "repo"
-                    )
-                    appendScm(node, ProjectProperties.Url.scm, ProjectProperties.Url.github)
+                    node.appendNode("licenses").appendNode("license").apply {
+                        appendNode("name", "The MIT License")
+                        appendNode("url", "https://opensource.org/licenses/MIT")
+                        appendNode("distribution", "repo")
+                    }
+                    node.appendNode("scm").apply {
+                        appendNode("connection", ProjectProperties.Url.scm)
+                        appendNode("developerConnection", ProjectProperties.Url.scm)
+                        appendNode("url", ProjectProperties.Url.github)
+                    }
                     val dependencies = node.appendNode("dependencies")
                     configurations.api.get().dependencies.forEach {
                         appendDependency(
@@ -73,21 +74,6 @@ internal fun Project.publishingSettings() {
     }
 }
 
-private fun appendLicense(parentNode: Node, name: String, url: String, distribution: String) {
-    parentNode.appendNode("license").apply {
-        appendNode("name", name)
-        appendNode("url", url)
-        appendNode("distribution", distribution)
-    }
-}
-
-private fun appendScm(parentNode: Node, connection: String, url: String) {
-    parentNode.appendNode("scm").apply {
-        appendNode("connection", connection)
-        appendNode("url", url)
-    }
-}
-
 private fun appendDependency(
     parentNode: Node,
     groupId: String,

buildSrc/src/main/java/build/internal/UploadArchives.kt → buildSrc/src/main/java/build/UploadArchives.kt

@@ -1,6 +1,5 @@
-package build.internal
+package build
 
-import build.ProjectProperties
 import org.gradle.api.Project
 import org.gradle.api.internal.HasConvention
 import org.gradle.api.plugins.BasePluginConvention
@@ -12,7 +11,7 @@ import org.gradle.kotlin.dsl.withGroovyBuilder
 private val Project.base: BasePluginConvention
     get() = ((this as? Project)?.convention ?: (this as HasConvention).convention).getPluginByName("base")
 
-internal fun Project.uploadArchivesSettings() {
+fun Project.uploadArchivesSettings() {
     tasks.named<Upload>("uploadArchives") {
         repositories.withGroovyBuilder {
             "mavenDeployer" {

lib/build.gradle.kts

@@ -47,7 +47,7 @@ dependencies {
     implementation(kotlin("stdlib"))
     implementation("androidx.appcompat:appcompat:1.2.0")
     implementation("androidx.core:core-ktx:1.3.2")
-    implementation("com.google.android.material:material:1.2.1")
+    implementation("com.google.android.material:material:1.3.0")
     testImplementation("junit:junit:4.13.1")
 }
 
@@ -60,4 +60,16 @@ tasks.named<DokkaTask>("dokkaHtml") {
     }
 }
 
-commonSettings()
+tasks.create("sourcesJar", Jar::class) {
+    archiveClassifier.set("sources")
+    from(android.sourceSets["main"].java.srcDirs)
+}
+
+artifacts {
+    archives(tasks.named<Jar>("sourcesJar"))
+}
+
+uploadArchivesSettings()
+publishingSettings()
+bintraySettings()
+dependencyUpdatesSettings()

sample/build.gradle.kts

@@ -42,11 +42,11 @@ dependencies {
     implementation(kotlin("stdlib"))
     implementation("androidx.appcompat:appcompat:1.2.0")
     implementation("androidx.constraintlayout:constraintlayout:2.0.4")
-    implementation("com.google.android.material:material:1.2.1")
-    implementation("androidx.navigation:navigation-fragment-ktx:2.3.2")
-    implementation("androidx.navigation:navigation-ui-ktx:2.3.2")
-    debugImplementation("com.squareup.leakcanary:leakcanary-android:2.5")
+    implementation("com.google.android.material:material:1.3.0")
+    implementation("androidx.navigation:navigation-fragment-ktx:2.3.3")
+    implementation("androidx.navigation:navigation-ui-ktx:2.3.3")
+    debugImplementation("com.squareup.leakcanary:leakcanary-android:2.6")
     testImplementation("junit:junit:4.13.1")
 }
 
-dependencyUpdates()
+dependencyUpdatesSettings()