Maven publication renamed.

Author: syslogic

.github/workflows/android-ci.yml

@@ -2,7 +2,7 @@ name: Android CI
 
 on:
   push:
-    branches: [ master ]
+    # branches: [ master ]
     paths-ignore:
       - '**/README.md'
       - 'screenshots/**'
@@ -34,7 +34,7 @@ jobs:
           java-version: '17'
 
       # https://github.com/gradle/actions/blob/main/docs/setup-gradle.md
-      - name: Setup Gradle
+      - name: 🐘 Setup Gradle
         uses: gradle/actions/setup-gradle@v4
         with:
           cache-encryption-key: ${{ SECRETS.GRADLE_ENCRYPTION_KEY }}
@@ -45,23 +45,23 @@ jobs:
       - name: Check out GPR Maintenance plugin
         run: git clone https://github.com/syslogic/gpr-maintenance-gradle-plugin.git ./buildSrc
 
-      # Run Gradle tasks
-      - name: Publish :library
+      - name: 🐘 chmod +x
+        run: chmod +x ./buildSrc/gradlew ./gradlew
+
+      - name: 🐘 Publish AAR to GPR
         env:
           GITHUB_ACTOR: ${{ GITHUB.REPOSITORY_OWNER }}
           GITHUB_TOKEN: ${{ SECRETS.GITHUB_TOKEN }}
         run: |
-          mkdir build
-          chmod +x ./gradlew
-          ./gradlew --max-workers=2 :library:lint :library:publishMavenPublicationToGitHubPackagesRepository
+          ./gradlew --max-workers=2 :androidx-github:lint :androidx-github:publishLibraryPublicationToGitHubPackagesRepository
           ls -la ./library/build/outputs/aar | grep aar
 
       # https://github.com/actions/upload-artifact
-      - name: 📦 Retain Artifacts (Release AAR)
+      - name: 📦 Retain Artifacts (AAR)
         id: retain-library-aar
         uses: actions/upload-artifact@v4
         with:
-          name: androidx-github-api
+          name: androidx-github
           path: ./library/build/outputs/aar/*.aar
           retention-days: 14
 
@@ -73,3 +73,21 @@ jobs:
           name: androidx-github-lint
           path: ./library/build/reports/*
           retention-days: 14
+
+#      - name: 🐘 Publish JAR to GPR
+#        env:
+#          GITHUB_ACTOR: ${{ GITHUB.REPOSITORY_OWNER }}
+#          GITHUB_TOKEN: ${{ SECRETS.GITHUB_TOKEN }}
+#        run: |
+#          # PUT -> HTTP 403
+#          # ./gradlew --max-workers=2 :buildSrc:publishPluginPublicationToGitHubPackagesRepository
+#          ./gradlew --max-workers=2 :buildSrc:build
+#          ls -la ./buildSrc/build/libs | grep jar
+
+#      - name: 📦 Retain Artifacts (JAR)
+#        id: retain-library-jar
+#        uses: actions/upload-artifact@v4
+#        with:
+#          name: gpr-maintenance-gradle-plugin
+#          path: ./buildSrc/build/libs/*.jar
+#          retention-days: 14

README.md

@@ -29,7 +29,7 @@ The JitPack repository URL would be: `maven { url = uri("https://jitpack.io") }`
 
     dependencies {
         // implementation "io.syslogic:androidx-github:master-SNAPSHOT"
-        implementation "io.syslogic:androidx-github:1.1.9"
+        implementation "io.syslogic:androidx-github:1.2.0"
     }
 
 [![Release](https://jitpack.io/v/syslogic/androidx-github.svg)](https://jitpack.io/#io.syslogic/androidx-github)

build.gradle.kts

@@ -5,7 +5,6 @@ import java.io.FileInputStream
 plugins {
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.android.library) apply false
-    alias(libs.plugins.jetbrains.dokka) apply false
     alias(libs.plugins.maven.publish) apply false
 }
 
@@ -60,11 +59,11 @@ allprojects {
         }
     }
 
-    project.ext.set("group_id", "io.syslogic")        // group
-    project.ext.set("github_handle", "syslogic")      // owner
-    project.ext.set("artifact_id", "androidx-github") // repository
-    project.ext.set("plugin_name", "GitHub API Android Library")
-    project.ext.set("plugin_desc", "Retrofit2 Client & Databindings")
+    project.ext.set("plugin_name",   "GitHub API Android Library")
+    project.ext.set("plugin_desc",   "Retrofit2 Client & Databindings")
+    project.ext.set("group_id",      "io.syslogic")     // group
+    project.ext.set("github_handle", "syslogic")        // owner
+    project.ext.set("artifact_id",   "androidx-github") // repo
 }
 
 // rootProject > clean

gradle.properties

@@ -8,5 +8,5 @@ org.gradle.workers.max=6
 org.gradle.parallel=true
 org.gradle.welcome=never
 
-android.useAndroidX=true
 android.enableJetifier=false
+android.useAndroidX=true

gradle/libs.versions.toml

@@ -1,16 +1,15 @@
 [versions]
-app_version_code             = '4'
-app_version_name             = '1.0.5'
+app_version_code             = '20'
+app_version_name             = '1.2.1'
 android_build_tools          = '36.0.0'
 android_compile_sdk          = '36'
 android_target_sdk           = '36'
 android_min_sdk              = '22'
 
 # Gradle Plugins
 kotlin                       = '2.2.0'
-maven_publish                = '0.34.0'
-jetbrains_dokka              = '1.9.20'
 gpr_maintenance              = '1.0.0'
+maven_publish                = '0.34.0'
 android_gradle_plugin        = '8.12.0'
 material_design              = '1.12.0'
 retrofit                     = '3.0.0'
@@ -43,10 +42,6 @@ android_application          = { id = "com.android.application", version.ref = "
 android_library              = { id = "com.android.library", version.ref = "android_gradle_plugin" }
 androidx_room                = { id = "androidx.room", version.ref = "androidx_room" }
 maven_publish                = { id = "com.vanniktech.maven.publish", version.ref = "maven_publish" }
-jetbrains_dokka              = { id = "org.jetbrains.dokka", version.ref = "jetbrains_dokka" }
-
-# git clone https://github.com/syslogic/gpr-maintenance-gradle-plugin.git ./buildSrc
-gpr_maintenance              = { id = "io.syslogic.gpr.maintenance" }
 
 [libraries]
 material_design              = { module = "com.google.android.material:material", version.ref = "material_design" }

library/build.gradle

@@ -1,17 +1,16 @@
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.androidx.room)
-    alias(libs.plugins.jetbrains.dokka)
     alias(libs.plugins.maven.publish)
-    alias(libs.plugins.gpr.maintenance)
+}
+
+if (! pluginManager.hasPlugin("io.syslogic.gpr.maintenance")) {
+    apply plugin: "io.syslogic.gpr.maintenance"
 }
 
 group = "io.syslogic"
 version = libs.versions.app.version.name.get()
-
-base {
-    archivesName = "androidx-github-api"
-}
+base.archivesName = "androidx-github-$version"
 
 android {
     namespace = "io.syslogic.github.api"
@@ -53,7 +52,6 @@ android {
     }
 
     lint {
-        lintConfig = project.file("lint.xml")
         checkAllWarnings = true
         warningsAsErrors = true
         abortOnError = false
@@ -107,7 +105,7 @@ Configuration implCls = configurations.create("implCls", {
 
 tasks.register("javadoc", Javadoc) {
 
-    title = "GitHub API Client ${android.defaultConfig.versionName}"
+    title = "GitHub API ${android.defaultConfig.versionName}"
     source = android.sourceSets.main.java.srcDirs
     destinationDir = project.file("build/outputs/javadoc")
 
@@ -160,28 +158,30 @@ tasks.register("javadoc", Javadoc) {
 }
 
 tasks.register("javadocJar", Jar) {
-    dependsOn(javadoc)
     archiveClassifier.set("javadoc")
     from(javadoc.destinationDir)
+    dependsOn(javadoc)
 }
 
-tasks.register('sourcesJar', Jar) {
+tasks.register("sourcesJar", Jar) {
     from(android.sourceSets.main.java.srcDirs)
-    archiveClassifier.set('sources')
+    archiveClassifier.set("sources")
+}
+
+artifacts {
+    archives(javadocJar)
+    archives(sourcesJar)
 }
 
 afterEvaluate {
+
     publishing {
         publications {
-            register(MavenPublication) {
-                from components["release"]
+            library(MavenPublication) {
+                from(components["release"])
                 groupId = "${group_id}"
                 artifactId = "${artifact_id}"
-                version = libs.versions.app.version.name.get()
-                artifacts {
-                    archives(javadocJar)
-                    archives(sourcesJar)
-                }
+                version = "${libs.versions.app.version.name.get()}"
                 pom {
                     name = "${plugin_name}"
                     description = "${plugin_desc}"
@@ -215,6 +215,7 @@ if (pluginManager.hasPlugin("io.syslogic.gpr.maintenance")) {
         groupId = project.ext.get("group_id")        // group
         packageName = project.ext.get("artifact_id") // repo
         listPackagesAfterPublish = false
+        deleteOnConflict = true
         deleteLastVersion = true
     }
 }

library/lint.xml

@@ -18,8 +18,7 @@ if (rootProject.file("token.properties").exists()) {
 }
 
 base {
-    String versionName = libs.versions.app.version.name.get()
-    archivesName = "github_client_$versionName"
+    archivesName = "androidx-github-client"
 }
 
 android {
@@ -121,7 +120,7 @@ android {
 
 dependencies {
 
-    api(project(path: ":library"))
+    api(project(path: ":androidx-github"))
 
     // Material Design Components
     implementation(libs.material.design)

mobile/build.gradle

@@ -3,6 +3,16 @@ pluginManagement {
         gradlePluginPortal()
         mavenCentral()
         google()
+        maven {
+            name = "GitHubPackages"
+            url = uri("https://maven.pkg.github.com/syslogic/gpr-maintanance-gradle-plaugin")
+            if (System.getenv("GITHUB_ACTOR") != null && System.getenv("GITHUB_ACTOR") != null) {
+                credentials {
+                    username = System.getenv("GITHUB_ACTOR")
+                    password = System.getenv("GITHUB_TOKEN")
+                }
+            }
+        }
     }
 }
 
@@ -16,11 +26,12 @@ dependencyResolutionManagement {
     }
 }
 
-rootProject.name = "GitHub Client"
+rootProject.name = "androidx-github-client"
 
 include(":library")
+project(":library").name = "androidx-github"
 
-/* JitPack: exclude module `:mobile` */
-if (System.getenv("JITPACK") == null) {
+/* GitHub & JitPack: don't include module `:mobile` */
+if (System.getenv("JITPACK") == null && System.getenv("GITHUB_ACTIONS") == null) {
     include(":mobile")
 }