Skip to content

Commit d70af0e

Browse files
committedAug 19, 2019
fix Gradle
1 parent 29a62b7 commit d70af0e

File tree

2 files changed

+15
-39
lines changed

2 files changed

+15
-39
lines changed
 

‎build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ buildscript {
1010
}
1111

1212
plugins {
13-
id "com.jfrog.bintray" version "1.7.3"
13+
id "com.jfrog.bintray" version "1.8.4"
1414
}
1515

1616
plugins {
17-
id "com.github.dcendents.android-maven" version "2.0"
17+
id "com.github.dcendents.android-maven" version "2.1"
1818
}
1919

2020
bintray {

‎library/build.gradle

+13-37
Original file line numberDiff line numberDiff line change
@@ -54,49 +54,16 @@ android {
5454
}
5555
}
5656

57-
install {
58-
repositories.mavenInstaller {
59-
pom.project {
60-
name POM_NAME
61-
description POM_DESCRIPTION
62-
url POM_URL
63-
inceptionYear '2016'
64-
65-
packaging 'aar'
66-
group GROUP
67-
artifactId POM_ARTIFACT_ID
68-
version VERSION_NAME
69-
70-
licenses {
71-
license {
72-
name 'The Apache Software License, Version 2.0'
73-
url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
74-
distribution 'repo'
75-
}
76-
}
77-
scm {
78-
connection POM_SCM_URL
79-
url POM_SCM_CONNECTION
80-
81-
}
82-
developers {
83-
developer {
84-
name 'CodePath, Inc.'
85-
}
86-
}
87-
}
88-
}
89-
}
90-
9157
bintray {
92-
user = System.getenv('BINTRAY_USER')
93-
key = System.getenv('BINTRAY_API_KEY')
58+
user = project.hasProperty('bintrayUser') ? project.property('bintrayUser') : System.getenv('BINTRAY_USER')
59+
key = project.hasProperty('bintrayApiKey') ? project.property('bintrayApiKey') : System.getenv('BINTRAY_API_KEY')
60+
9461
configurations = ['archives'] // needs apply plugin 'com.jfrog.bintray' to work
9562

9663
pkg {
9764
repo = 'maven'
9865
name = 'android-oauth-handler'
99-
// userOrg = 'codepath'
66+
userOrg = 'codepath'
10067
licenses = ['Apache-2.0']
10168
vcsUrl = 'https://github.com/codepath/android-oauth-handler.git'
10269
version {
@@ -109,6 +76,15 @@ bintray {
10976

11077
}
11178

79+
task sourcesJar(type: Jar) {
80+
from android.sourceSets.main.java.srcDirs
81+
archiveClassifier.set("sources")
82+
}
83+
84+
artifacts {
85+
archives sourcesJar
86+
}
87+
11288
ext {
11389
supportVersion = '28.0.0'
11490
}

0 commit comments

Comments
 (0)