diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 816e554..0ebcb24 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -53,4 +53,5 @@ jobs: run: gradle publish working-directory: ./java env: + RELEASE_VERSION: ${{ github.ref_name }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/java/build.gradle b/java/build.gradle index 761e59d..448748b 100644 --- a/java/build.gradle +++ b/java/build.gradle @@ -7,7 +7,6 @@ buildscript { dependencies { classpath libs.gradle classpath libs.rust.android - classpath libs.axion.release.plugin } } diff --git a/java/gradle/libs.versions.toml b/java/gradle/libs.versions.toml index b6c3187..d41e224 100644 --- a/java/gradle/libs.versions.toml +++ b/java/gradle/libs.versions.toml @@ -2,11 +2,9 @@ gradle = "8.7.3" rustAndroid = "0.9.4" junitJupiterApi = "5.11.3" -axionReleasePlugin = "1.17.0" [libraries] gradle = { module = "com.android.tools.build:gradle", version.ref = "gradle" } rust-android = { module = "org.mozilla.rust-android-gradle:plugin", version.ref = "rustAndroid" } junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junitJupiterApi" } junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junitJupiterApi" } -axion-release-plugin = { module = "pl.allegro.tech.build:axion-release-plugin", version.ref = "axionReleasePlugin" } diff --git a/java/lib/build.gradle b/java/lib/build.gradle index ebe4aa0..2753e99 100644 --- a/java/lib/build.gradle +++ b/java/lib/build.gradle @@ -1,6 +1,5 @@ apply plugin: 'maven-publish' apply plugin: 'com.android.library' -apply plugin: 'pl.allegro.tech.build.axion-release' apply plugin: 'org.mozilla.rust-android-gradle.rust-android' android { @@ -62,13 +61,12 @@ tasks.configureEach { task -> } } -def libVersion = scmVersion.version publishing { publications { release(MavenPublication) { - groupId = 'dev.arkbuilders' artifactId = 'core' - version = libVersion + groupId = 'dev.arkbuilders' + version = System.getenv('RELEASE_VERSION') afterEvaluate { from components.release }