Skip to content

Commit c1adf27

Browse files
raf-abtastyraf-abtasty
authored
Fix/fs3 bd001 java 8 (#11)
Merge publish on maven central
1 parent 7e116d9 commit c1adf27

8 files changed

Lines changed: 65 additions & 69 deletions

File tree

‎.github/workflows/release.yml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ on:
66
tags:
77
- '*.*.*'
88
- '*.*'
9-
10-
119
jobs:
1210
build:
1311
name: Run Unit Tests
@@ -28,14 +26,17 @@ jobs:
2826
run: gradle wrapper
2927
- name: Release (clean, assemble, test, publish)
3028
env:
31-
ARTIFACTORY_USER: ${{ secrets.ARTIFACTORY_USER }}
32-
ARTIFACTORY_KEY: ${{ secrets.ARTIFACTORY_KEY }}
29+
SONATYPE_SIGNING_KEY: ${{ secrets.SONATYPE_SIGNING_KEY }}
30+
SONATYPE_SIGNING_PWD: ${{ secrets.SONATYPE_SIGNING_PWD }}
31+
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
32+
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
33+
SONATYPE_REPOSITORY: ${{ secrets.SONATYPE_REPOSITORY }}
3334
run: |
3435
bash ./gradlew clean
3536
bash ./gradlew generateBuildConfig
36-
bash ./gradlew assemble
37+
bash ./gradlew flagship:assemble
3738
bash ./gradlew flagship:test
38-
# bash ./gradlew artifactoryPublish
39+
bash ./gradlew publishToSonatype closeSonatypeStagingRepository
3940
- name: Coverage Report
4041
run: ./gradlew jacocoTestReport
4142
- name: Upload coverage to Codecov

‎build.gradle‎

Lines changed: 31 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,30 @@
1+
apply plugin: 'io.github.gradle-nexus.publish-plugin'
12
buildscript {
23
ext {
3-
artifact_id = "flagship-java"
4-
group_id = "com.abtasty"
5-
user_org = "abtasty"
6-
}
7-
8-
def flagship_version_name = System.getenv('FLAGSHIP_VERSION_NAME')
9-
def flagship_version_code = System.getenv('FLAGSHIP_VERSION_CODE')
10-
11-
def bintray_user = System.getenv('ARTIFACTORY_USER')
12-
def bintray_key = System.getenv('ARTIFACTORY_KEY')
13-
14-
if (flagship_version_name != null)
15-
rootProject.ext.flagship_version_name = flagship_version_name
16-
else
17-
rootProject.ext.flagship_version_name = "3.0.6"
18-
19-
if (flagship_version_code != null)
20-
rootProject.ext.flagship_version_code = flagship_version_code
21-
else
22-
rootProject.ext.flagship_version_code = 2
23-
24-
if (bintray_user != null && bintray_key != null) {
25-
rootProject.ext.bintray_user = bintray_user
26-
rootProject.ext.bintray_key = bintray_key
27-
} else {
28-
try {
29-
def keystorePropertiesFile = file(getProjectDir().absolutePath+ "/keystore.properties")
30-
def keystoreProperties = new Properties()
31-
keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
32-
33-
rootProject.ext.bintray_user = keystoreProperties.getProperty("artifactory_user")
34-
rootProject.ext.bintray_key = keystoreProperties.getProperty("artifactory_key")
35-
36-
} catch (Exception e) {
37-
rootProject.ext.bintray_user = ''
38-
rootProject.ext.bintray_key = ''
39-
print e
40-
}
4+
maven_artifact_id = "flagship-java"
5+
maven_repo = "flagship-java"
6+
maven_group_id = "com.abtasty"
7+
maven_user_org = "abtasty"
8+
9+
flagship_version_name = System.getenv('FLAGSHIP_VERSION_NAME') ?: "3.0.6"
10+
flagship_version_code = System.getenv('FLAGSHIP_VERSION_CODE') ?: 15
11+
sonatype_signing_key = System.getenv('SONATYPE_SIGNING_KEY')
12+
sonatype_signing_pwd = System.getenv('SONATYPE_SIGNING_PWD')
13+
sonatype_username = System.getenv('SONATYPE_USERNAME') ?: ossrhUsername
14+
sonatype_password = System.getenv('SONATYPE_PASSWORD') ?: ossrhPassword
15+
sonatype_repository_id = System.getenv('SONATYPE_REPOSITORY') ?: stagingRepositoryId
4116
}
4217

4318
repositories {
4419
google()
4520
mavenCentral()
21+
maven { url 'https://jitpack.io' }
22+
maven { url "https://plugins.gradle.org/m2/" }
4623
}
4724

4825
dependencies {
26+
classpath "io.github.gradle-nexus:publish-plugin:1.3.0"
27+
classpath "org.springframework.boot:spring-boot-gradle-plugin:2.7.0"
4928
}
5029
}
5130

@@ -56,6 +35,20 @@ allprojects {
5635
}
5736
}
5837

38+
nexusPublishing {
39+
repositories {
40+
sonatype {
41+
nexusUrl.set(uri("https://s01.oss.sonatype.org/service/local/"))
42+
snapshotRepositoryUrl.set(uri("https://s01.oss.sonatype.org/content/repositories/snapshots/"))
43+
stagingProfileId = sonatype_repository_id
44+
username = sonatype_username
45+
password = sonatype_password
46+
}
47+
}
48+
}
49+
50+
apply plugin: "org.springframework.boot"
51+
5952
task clean(type: Delete) {
6053
delete rootProject.buildDir
6154
}

‎demo/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ repositories {
2222
dependencies {
2323
implementation fileTree(dir: 'libs', include: ['*.jar'])
2424
implementation project(':flagship')
25-
implementation 'org.json:json:20210307'
25+
implementation 'org.json:json:20230227'
2626
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.0'
2727
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.0'
2828
implementation('com.squareup.okhttp3:okhttp:4.9.1')

‎demoqa/build.gradle‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1+
12
plugins {
2-
id 'org.springframework.boot' version '2.5.0'
3-
id 'io.spring.dependency-management' version '1.0.11.RELEASE'
43
id 'java'
54
}
65

@@ -13,11 +12,11 @@ repositories {
1312

1413
dependencies {
1514
implementation project(':flagship')
16-
implementation group: 'org.json', name: 'json', version: '20201115'
17-
implementation 'org.springframework.boot:spring-boot-starter-web:2.5.4'
18-
implementation 'org.springframework.session:spring-session-core:2.5.2'
19-
developmentOnly 'org.springframework.boot:spring-boot-devtools:2.5.4'
20-
testImplementation 'org.springframework.boot:spring-boot-starter-test:2.5.4'
15+
implementation group: 'org.json', name: 'json', version: '20230227'
16+
implementation 'org.springframework.boot:spring-boot-starter-web:2.7.0'
17+
implementation 'org.springframework.session:spring-session-core:2.7.0'
18+
implementation 'org.springframework.boot:spring-boot-devtools:2.7.0'
19+
testImplementation 'org.springframework.boot:spring-boot-starter-test:2.7.0'
2120
}
2221

2322
test {

‎flagship/build.gradle‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
plugins {
23
id 'java'
34
}
@@ -24,18 +25,16 @@ task generateBuildConfig {
2425
compileJava.dependsOn generateBuildConfig
2526
compileTestJava.dependsOn generateBuildConfig
2627

27-
28-
2928
sourceSets.main.java.srcDirs += ["$buildDir/generated/sources/buildConfig"]
3029

3130
repositories {
3231
mavenCentral()
3332
}
3433

3534
dependencies {
36-
implementation 'org.json:json:20220320'
35+
implementation 'org.json:json:20230227'
3736
implementation 'junit:junit:4.13.2'
38-
implementation 'org.xerial:sqlite-jdbc:3.36.0.3'
37+
implementation 'org.xerial:sqlite-jdbc:3.42.0.0'
3938

4039
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.0'
4140
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.0'
@@ -45,18 +44,13 @@ dependencies {
4544
}
4645

4746
jar {
48-
archivesBaseName = artifact_id + "-" + flagship_version_name
47+
archivesBaseName = maven_artifact_id + "-" + flagship_version_name
4948
configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
5049
}
5150

52-
5351
jacocoTestReport {
54-
dependsOn test
5552
reports {
56-
xml.enabled true
57-
xml.destination file("${buildDir}/reports/jacoco/report.xml")
58-
html.enabled true
59-
csv.enabled true
53+
html.outputLocation = file("${buildDir}/reports/jacoco/report.xml")
6054
}
6155
subprojects.each {
6256
sourceSets it.sourceSets.main

‎flagship/flagship-publishing.gradle‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ apply plugin: 'signing'
22
apply plugin: 'maven-publish'
33
apply plugin: 'jacoco'
44

5+
jacoco {
6+
toolVersion = "0.8.10"
7+
}
58
java {
69
withJavadocJar()
710
withSourcesJar()
@@ -11,12 +14,12 @@ project(':flagship') {
1114
publishing {
1215
publications {
1316
jar(MavenPublication) {
14-
groupId = group_id
15-
artifactId = artifact_id
17+
groupId = maven_group_id
18+
artifactId = maven_artifact_id
1619
version = flagship_version_name
1720
from components.java
1821
pom {
19-
name = artifact_id
22+
name = maven_artifact_id
2023
description = 'Visit https://developers.flagship.io/ to get started with Flagship.'
2124
url = 'https://github.com/flagship-io/flagship-android'
2225
licenses {
@@ -46,15 +49,17 @@ project(':flagship') {
4649
name = "OSSRH"
4750
url = 'https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/'
4851
credentials {
49-
username = ossrhUsername
50-
password = ossrhPassword
52+
username = sonatype_username
53+
password = sonatype_password
5154
}
5255
}
5356
}
5457
}
5558
}
5659

5760
signing {
61+
if (sonatype_signing_key && sonatype_signing_pwd)
62+
useInMemoryPgpKeys(sonatype_signing_key, sonatype_signing_pwd)
5863
sign publishing.publications.jar
5964
}
6065

‎gradle.properties‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,6 @@
1+
signing.keyId=
2+
signing.password=
3+
signing.secretKeyRingFile=
4+
stagingRepositoryId=
15
ossrhUsername=
26
ossrhPassword=

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)