diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml index 0b3456ceb..9af92399e 100644 --- a/.github/workflows/pullrequest.yml +++ b/.github/workflows/pullrequest.yml @@ -116,7 +116,7 @@ jobs: - name: Run tests run: ./gradlew test - name: Test jitpack publish command - run: ./gradlew :chartLib:publishToMavenLocal + run: ./gradlew :chartLib:publishToMavenLocal :chartLibCompose:publishToMavenLocal -PRELEASE_SIGNING_ENABLED=false - name: Code checks run: ./gradlew check - name: Archive Lint report diff --git a/README.md b/README.md index 5e9bb6c37..eb269758b 100644 --- a/README.md +++ b/README.md @@ -25,13 +25,15 @@ Issues are ignored, but pull requests are not. If you need to get something done ### Gradle Setup with jitpack.io -```gradle +```gradle.kts repositories { - maven { url 'https://jitpack.io' } + maven { url = uri("https://jitpack.io") } } dependencies { - implementation "com.github.AppDevNext:AndroidChart:$latestVersion" + implementation("com.github.AppDevNext.AndroidChart:chartLib:VERSION") + // or for compose + implementation("com.github.AppDevNext.AndroidChart:chartLibCompose:VERSION") } ``` diff --git a/chartLib/build.gradle.kts b/chartLib/build.gradle.kts index fea1cd0a3..446eae568 100644 --- a/chartLib/build.gradle.kts +++ b/chartLib/build.gradle.kts @@ -67,11 +67,16 @@ tasks.register("androidSourcesJar") { from(android.sourceSets["main"].java.srcDirs) } -group = "info.mxtracks" +group = project.findProperty("group")?.toString() ?: "info.AppDevNext" var versionVersion = getVersionText() println("Build version $versionVersion") mavenPublishing { + coordinates( + groupId = project.findProperty("group")?.toString() ?: "info.AppDevNext", + artifactId = "chartLib", + version = "$versionVersion" + ) pom { name = "Android Chart" description = diff --git a/chartLibCompose/build.gradle.kts b/chartLibCompose/build.gradle.kts index 4d7692a6e..a4d7824c5 100644 --- a/chartLibCompose/build.gradle.kts +++ b/chartLibCompose/build.gradle.kts @@ -77,13 +77,18 @@ tasks.register("androidSourcesJar") { from(android.sourceSets["main"].java.srcDirs) } -group = "info.mxtracks" +group = project.findProperty("group")?.toString() ?: "info.AppDevNext" var versionVersion = getVersionText() println("Build version $versionVersion") mavenPublishing { + coordinates( + groupId = project.findProperty("group")?.toString() ?: "info.AppDevNext", + artifactId = "chartLibCompose", + version = "$versionVersion" + ) pom { - name = "Android Chart" + name = "Android Chart compose" description = "A powerful Android chart view/graph view library, supporting line- bar- pie- radar- bubble- and candlestick charts as well as scaling, dragging and animations" inceptionYear = "2022" diff --git a/jitpack.yml b/jitpack.yml index 18789d592..2ed5bc3a5 100644 --- a/jitpack.yml +++ b/jitpack.yml @@ -1,5 +1,5 @@ jdk: - openjdk17 install: - - ./gradlew :chartLib:build :chartLib:publishToMavenLocal -x :chartLib:test + - ./gradlew :chartLib:publishToMavenLocal :chartLibCompose:publishToMavenLocal -Pgroup=com.github.AppDevNext.AndroidChart -PRELEASE_SIGNING_ENABLED=false -x test - find . -name "*.aar"