Skip to content

Commit

Permalink
Merge pull request #106 from kiwix/Fixes#105
Browse files Browse the repository at this point in the history
Fixed: CD is failing because there are multiple jar and sources files to upload.
  • Loading branch information
MohitMaliFtechiz authored Jun 7, 2024
2 parents cd8ac21 + 1d9ba41 commit 0cc473a
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 26 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
run: bash ./install_deps.sh

- name: Compile and prepare package
run: ./gradlew buildHeaders build assemble androidSourcesJar
run: ./gradlew buildHeaders build assemble

- name: Publish to Maven Central
run: ./gradlew publishReleasePublicationToSonatypeRepository --max-workers 1 closeAndReleaseSonatypeStagingRepository
Expand Down
25 changes: 0 additions & 25 deletions lib/publish.gradle
Original file line number Diff line number Diff line change
@@ -1,23 +1,6 @@
apply plugin: 'maven-publish'
apply plugin: 'signing'

tasks.register('androidSourcesJar', Jar) {
archiveClassifier.set('sources')
if (project.plugins.findPlugin("com.android.library")) {
// For Android libraries
from android.sourceSets.main.java.srcDirs
from android.sourceSets.main.kotlin.srcDirs
} else {
// For pure Kotlin libraries, in case you have them
from sourceSets.main.java.srcDirs
from sourceSets.main.kotlin.srcDirs
}
}

artifacts {
archives androidSourcesJar
}

def siteUrl = 'https://www.kiwix.org/en/'
def gitUrl = 'https://github.com/kiwix/libkiwix.git'

Expand All @@ -35,7 +18,6 @@ afterEvaluate {

from components.release

artifact androidSourcesJar
pom {
name = ARTIFACT_ID
description = 'LibKiwix Android library'
Expand Down Expand Up @@ -71,13 +53,6 @@ afterEvaluate {
}
}
}

// Set dependency for the metadata file generation task
tasks.withType(GenerateModuleMetadata).tap {
configureEach {
dependsOn tasks.named("androidSourcesJar")
}
}
}

signing {
Expand Down

0 comments on commit 0cc473a

Please sign in to comment.