Skip to content

Commit 867bfe1

Browse files
committed
Fix CI build
1 parent b0a0c36 commit 867bfe1

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

src/AndroidClient/android/build.gradle

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,10 @@ android {
2222
}
2323
}
2424

25-
Properties properties = new Properties()
26-
properties.load(project.file('./local.properties').newDataInputStream())
25+
Properties properties = System.properties;
26+
if(properties.getProperty("bintray.user", null) == null) {
27+
properties.load(project.file('./local.properties').newDataInputStream())
28+
}
2729

2830
def siteUrl = 'https://github.com/ServiceStack/ServiceStack.Java' // Homepage URL of the library
2931
def gitUrl = 'https://github.com/ServiceStack/ServiceStack.Java.git' // Git repository URL

src/AndroidClient/client/build.gradle

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,14 @@ android {
2525
}
2626

2727
dependencies {
28-
compile fileTree(dir: 'libs', include: ['*.jar'])
2928
compile 'com.google.code.gson:gson:2.3.1'
3029
}
3130

32-
Properties properties = new Properties()
33-
properties.load(project.file('./local.properties').newDataInputStream())
31+
Properties properties = System.properties;
32+
if(properties.getProperty("bintray.user", null) == null) {
33+
properties.load(project.file('./local.properties').newDataInputStream())
34+
}
35+
3436

3537
def siteUrl = 'https://github.com/ServiceStack/ServiceStack.Java' // Homepage URL of the library
3638
def gitUrl = 'https://github.com/ServiceStack/ServiceStack.Java.git' // Git repository URL
@@ -122,7 +124,7 @@ task clearJar(type: Delete) {
122124
artifacts {
123125
archives javadocJar
124126
archives sourcesJar
125-
archives file: new File('build/libs/' + packageId + '-' + version + '.jar'), name: packageId, type: 'jar'
127+
archives file: new File(project.projectDir,'build/libs/' + packageId + '-' + version + '.jar'), name: packageId, type: 'jar'
126128
}
127129

128130
task findConventions << {

0 commit comments

Comments
 (0)