Skip to content

Commit 6fdad45

Browse files
authored
Merge pull request #1 from Permify/versioning
Versioning
2 parents 4308c9c + b1fa4dc commit 6fdad45

2 files changed

Lines changed: 10 additions & 9 deletions

File tree

.github/workflows/mvn-publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212
with:
1313
java-version: '17'
1414
distribution: 'adopt'
15-
- name: Validate Gradle wrapper
16-
uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b
1715
- name: Change wrapper permissions
1816
run: chmod +x ./gradlew
17+
- name: Validate Gradle wrapper
18+
uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b
1919
- name: Publish SDK
2020
uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1
2121
with:

build.gradle

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apply plugin: 'idea'
22
apply plugin: 'eclipse'
33

44
group = 'co.permify'
5-
version = '0.0.1'
5+
version = '0.0.1' // Default version
66

77
buildscript {
88
repositories {
@@ -18,7 +18,7 @@ repositories {
1818
mavenCentral()
1919
}
2020

21-
if(hasProperty('target') && target == 'android') {
21+
if (hasProperty('target') && target == 'android') {
2222

2323
apply plugin: 'com.android.library'
2424
apply plugin: 'com.github.dcendents.android-maven'
@@ -36,7 +36,6 @@ if(hasProperty('target') && target == 'android') {
3636
targetCompatibility JavaVersion.VERSION_1_8
3737
}
3838

39-
// Rename the aar correctly
4039
libraryVariants.all { variant ->
4140
variant.outputs.each { output ->
4241
def outputFile = output.outputFile
@@ -54,7 +53,7 @@ if(hasProperty('target') && target == 'android') {
5453

5554
afterEvaluate {
5655
android.libraryVariants.all { variant ->
57-
def task = project.tasks.create "jar${variant.name.capitalize()}", Jar
56+
def task = project.tasks.create("jar${variant.name.capitalize()}", Jar)
5857
task.description = "Create jar artifact for ${variant.name}"
5958
task.dependsOn variant.javaCompile
6059
task.from variant.javaCompile.destinationDirectory
@@ -94,13 +93,15 @@ if(hasProperty('target') && target == 'android') {
9493
}
9594
publications {
9695
maven(MavenPublication) {
97-
artifactId = 'permify'
98-
from components.java
96+
artifactId = 'permify'
97+
from components.java
98+
def commitHash = 'git rev-parse --short HEAD'.execute().text.trim()
99+
version = "${version}-${commitHash}"
99100
}
100101
}
101102
}
102103

103-
task execute(type:JavaExec) {
104+
task execute(type: JavaExec) {
104105
mainClass = System.getProperty('mainClass')
105106
classpath = sourceSets.main.runtimeClasspath
106107
}

0 commit comments

Comments
 (0)