Add support for Android Gradle Plugin 7.+. Upgrade dependencies and publishing mechanics (#51)

Author: adriangl

.idea/.name

@@ -34,11 +34,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Security
 - No security issues fixed!
 
+## [3.0.0] - 2022-02-03
+### Changed
+- BREAKING: Update dependencies to work with Android Gradle Plugin 7.+. This will break compatibility with
+projects that use versions lower than 7.0
+
 ## [2.4.2] - 2021-10-17
 ### Changed
 - Change detekt rules according to library update to version 1.18.1
 ### Removed
-- Remove `jcenter()` from project.
+- Remove `jcenter()` from project
 
 ## [2.4.1] - 2021-09-16
 ### Fixed
@@ -406,7 +411,8 @@ res_dir_path -> resDirPath
 ### Added
 - Initial release.
 
-[Unreleased]: https://github.com/hyperdevs-team/poeditor-android-gradle-plugin/compare/2.4.2...HEAD
+[Unreleased]: https://github.com/hyperdevs-team/poeditor-android-gradle-plugin/compare/3.0.0...HEAD
+[3.0.0]: https://github.com/hyperdevs-team/poeditor-android-gradle-plugin/compare/2.4.2...3.0.0
 [2.4.2]: https://github.com/hyperdevs-team/poeditor-android-gradle-plugin/compare/2.4.1...2.4.2
 [2.4.1]: https://github.com/hyperdevs-team/poeditor-android-gradle-plugin/compare/2.4.0...2.4.1
 [2.4.0]: https://github.com/hyperdevs-team/poeditor-android-gradle-plugin/compare/2.3.0...2.4.0

CHANGELOG.md

@@ -7,6 +7,9 @@ Simple plug-in that eases importing [PoEditor](https://poeditor.com) localized s
 This plug-in super-charges your Android project by providing tasks to download your localized strings from the PoEditor service into you Android project.
 It also provides a built-in syntax to handle placeholders to enhance the already awesome Android support from PoEditor.
 
+## Minimum requirements
+* Android Gradle Plug-in 7.0 or above
+
 ## Setting Up
 In your main `build.gradle`, add [jitpack.io](https://jitpack.io/) repository in the `buildscript` block and include the plug-in as a dependency:
 

README.md

@@ -16,8 +16,6 @@
  * limitations under the License.
  */
 
-group = "com.github.hyperdevs-team"
-
 buildscript {
     repositories {
         mavenCentral()
@@ -30,16 +28,17 @@ buildscript {
     }
 
     dependencies {
-        classpath(kotlin("gradle-plugin", version = "1.4.20"))
+        classpath(libs.kotlin.gradle)
     }
 }
 
 plugins {
     `java-gradle-plugin`
     `kotlin-dsl`
     groovy
-    maven
-    id("io.gitlab.arturbosch.detekt").version("1.18.1")
+    `maven-publish`
+    alias(libs.plugins.detekt)
+    alias(libs.plugins.gitVersionGradle)
 }
 
 repositories {
@@ -55,40 +54,46 @@ repositories {
 dependencies {
     implementation(localGroovy())
 
-    compileOnly("com.android.tools.build:gradle:4.2.0")
-
-    implementation("org.jetbrains.kotlin:kotlin-stdlib:1.4.20")
-
-    implementation("com.squareup.moshi:moshi:1.12.0")
-    implementation("com.squareup.moshi:moshi-kotlin:1.12.0")
-    implementation("com.squareup.moshi:moshi-adapters:1.12.0")
-
-    implementation("com.squareup.retrofit2:retrofit:2.9.0")
-    implementation("com.squareup.retrofit2:converter-moshi:2.9.0")
+    compileOnly(libs.android.buildTools)
 
-    implementation("com.squareup.okhttp3:logging-interceptor:4.9.1")
-    implementation("com.squareup.okhttp3:okhttp:4.9.1")
-
-    implementation("io.github.cdimascio:dotenv-kotlin:6.2.2")
+    implementation(libs.kotlin.stdlib)
+    implementation(libs.bundles.moshi)
+    implementation(libs.bundles.retrofit)
+    implementation(libs.bundles.okhttp3)
+    implementation(libs.dotenvKotlin)
 
     testImplementation(gradleTestKit())
     testImplementation(kotlin("test"))
-    testImplementation("junit:junit:4.13.2")
+    testImplementation(libs.junit)
 
-    detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.18.1")
+    detektPlugins(libs.detekt.formatting)
 }
 
 java {
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
+
+    withJavadocJar()
+    withSourcesJar()
+}
+
+tasks.javadoc {
+    if (JavaVersion.current().isJava9Compatible) {
+        (options as StandardJavadocDocletOptions).addBooleanOption("html5", true)
+    }
 }
 
 detekt {
-    toolVersion = "1.18.1"
+    toolVersion = libs.versions.detekt.get()
     config = files("${project.rootDir}/config/detekt.yml")
     autoCorrect = true
 }
 
+androidGitVersion {
+    codeFormat = "MMNNPP"
+    format = "%tag%"
+}
+
 tasks {
     test {
         useJUnit()
@@ -110,21 +115,54 @@ tasks {
     // Install hooks automatically before building a new compilation
     // Idea from: https://gist.github.com/KenVanHoeylandt/c7a928426bce83ffab400ab1fd99054a
     getByPath("compileKotlin").dependsOn(installGitHooks)
+}
 
-    val sourcesJar by creating(Jar::class) {
-        dependsOn(JavaPlugin.CLASSES_TASK_NAME)
-        archiveClassifier.set("sources")
-        from(sourceSets["main"].allSource)
-    }
-
-    val javadocJar by creating(Jar::class) {
-        val javadoc by tasks
-        from(javadoc)
-        archiveClassifier.set("javadoc")
-    }
-
-    artifacts {
-        add("archives", sourcesJar)
-        add("archives", javadocJar)
+group = "com.github.hyperdevs-team"
+version = androidGitVersion.name()
+
+publishing {
+    publications {
+        // Edit the `pluginMaven` publication, which is the name for the default publication task of the `java-gradle-plugin`
+        register<MavenPublication>("pluginMaven") {
+            groupId = "com.github.hyperdevs-team"
+            artifactId = "poeditor-android-gradle-plugin"
+
+            pom {
+                name.set("PoEditor Android Gradle Plug-in")
+                description.set("Gradle plug-in that enables importing PoEditor localized strings directly to an Android project")
+                url.set("https://github.com/hyperdevs-team/poeditor-android-gradle-plugin")
+                version = androidGitVersion.name()
+                inceptionYear.set("2016")
+
+                licenses {
+                    license {
+                        name.set("The Apache License, Version 2.0")
+                        url.set("http://www.apache.org/licenses/LICENSE-2.0.txt")
+                    }
+                }
+
+                developers {
+                    developer {
+                        name.set("Iván Martínez")
+                        id.set("imartinez")
+                        url.set("https://github.com/imartinez")
+                        roles.set(listOf("Initial work"))
+                    }
+
+                    developer {
+                        name.set("Adrián García")
+                        id.set("adriangl")
+                        url.set("https://github.com/adriangl")
+                        roles.set(listOf("Maintainer"))
+
+                        organization {
+                            name.set("HyperDevs")
+                            id.set("hyperdevs-team")
+                            url.set("https://github.com/hyperdevs-team")
+                        }
+                    }
+                }
+            }
+        }
     }
 }

build.gradle.kts

@@ -0,0 +1,37 @@
+[versions]
+kotlin = "1.6.10"
+detekt = "1.19.0"
+moshi = "1.12.0"
+retrofit = "2.9.0"
+okhttp = "4.9.3"
+
+[libraries]
+android-buildTools = "com.android.tools.build:gradle:7.1.0"
+
+kotlin-gradle = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
+kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
+
+moshi = { group = "com.squareup.moshi", name = "moshi", version.ref = "moshi"}
+moshi-kotlin = { group = "com.squareup.moshi", name = "moshi-kotlin", version.ref = "moshi"}
+moshi-adapters = { group = "com.squareup.moshi", name = "moshi-adapters", version.ref = "moshi"}
+
+retrofit = { group = "com.squareup.retrofit2", name = "retrofit", version.ref = "retrofit"}
+retrofit-converterMoshi = { group = "com.squareup.retrofit2", name = "converter-moshi", version.ref = "retrofit"}
+
+okhttp3 = { group = "com.squareup.okhttp3", name = "okhttp", version.ref = "okhttp"}
+okhttp3-loggingInterceptor = { group = "com.squareup.okhttp3", name = "logging-interceptor", version.ref = "okhttp"}
+
+dotenvKotlin = "io.github.cdimascio:dotenv-kotlin:6.2.2"
+
+junit = "junit:junit:4.13.2"
+
+detekt-formatting = { group = "io.gitlab.arturbosch.detekt", name = "detekt-formatting", version.ref = "detekt"}
+
+[plugins]
+detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
+gitVersionGradle = { id = "com.gladed.androidgitversion", version = "0.4.14"}
+
+[bundles]
+moshi = ["moshi", "moshi-kotlin", "moshi-adapters"]
+retrofit = ["retrofit", "retrofit-converterMoshi"]
+okhttp3 = ["okhttp3", "okhttp3-loggingInterceptor"]

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -16,4 +16,6 @@
  * limitations under the License.
  */
 
-rootProject.name = "poeditor"
+enableFeaturePreview("VERSION_CATALOGS")
+
+rootProject.name = "poeditor-android-gradle-plugin"

settings.gradle.kts

@@ -18,8 +18,8 @@
 
 package com.hyperdevs.poeditor.gradle
 
-import com.android.build.api.extension.ApplicationAndroidComponentsExtension
-import com.android.build.api.extension.LibraryAndroidComponentsExtension
+import com.android.build.api.variant.ApplicationAndroidComponentsExtension
+import com.android.build.api.variant.LibraryAndroidComponentsExtension
 import com.android.build.gradle.AppPlugin
 import com.android.build.gradle.LibraryExtension
 import com.android.build.gradle.LibraryPlugin