Minor changes

canopas · Oct 26, 2023 · 49bd496 · 49bd496
1 parent 749b757
commit 49bd496
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 20 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -11,14 +11,14 @@ jobs:
     steps:
       - name: Check out code
         uses: actions/checkout@v2
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v2
         with:
           distribution: adopt
-          java-version: 11
+          java-version: 17
 
       - name: Publish to MavenCentral
-        run: ./gradlew showcase:publishReleasePublicationToSonatypeRepository --max-workers 1 closeAndReleaseSonatypeStagingRepository
+        run: ./gradlew bottombar:publishReleasePublicationToSonatypeRepository --max-workers 1 closeAndReleaseSonatypeStagingRepository
         env:
           OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
           OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}

diff --git a/bottombar/build.gradle.kts b/bottombar/build.gradle.kts
@@ -4,8 +4,8 @@ plugins {
 }
 
 ext {
-    set("PUBLISH_GROUP_ID", "com.canopas.AnimatedBottomBarCompose")
-    set("PUBLISH_ARTIFACT_ID", "animatedbottombarcompose")
+    set("PUBLISH_GROUP_ID", "io.github.canopas")
+    set("PUBLISH_ARTIFACT_ID", "bottombar")
 }
 
 apply{
@@ -57,6 +57,7 @@ android {
     publishing {
         singleVariant("release") {
             withJavadocJar()
+            withSourcesJar()
         }
     }
 }

diff --git a/scripts/publish-module.gradle b/scripts/publish-module.gradle
@@ -1,18 +1,6 @@
 apply plugin: 'maven-publish'
 apply plugin: 'signing'
 
-tasks.register('androidSourcesJar', Jar) {
-    archiveClassifier.set('sources')
-    if (project.plugins.findPlugin("com.android.library")) {
-        from android.sourceSets.main.java.srcDirs
-    } else {
-        from sourceSets.main.java.srcDirs
-    }
-}
-
-artifacts {
-    archives androidSourcesJar
-}
 group = PUBLISH_GROUP_ID
 version = rootProject.ext["publish_version"]
 
@@ -33,8 +21,6 @@ afterEvaluate {
                     artifact("$buildDir/libs/${project.getName()}-${version}.jar")
                 }
 
-                artifact androidSourcesJar
-
                 // Mostly self-explanatory metadata
                 pom {
                     name = PUBLISH_ARTIFACT_ID
@@ -58,7 +44,7 @@ afterEvaluate {
                     scm {
                         connection = 'scm:git:github.com/canopas/AnimatedBottomBarCompose.git'
                         developerConnection = 'scm:git:ssh://github.com/canopas/AnimatedBottomBarCompose.git'
-                        url = 'https://github.com/canopas/AnimatedBottomBarCompose.git'
+                        url = 'https://github.com/canopas/AnimatedBottomBarCompose'
                     }
                 }
             }