Skip to content

Commit 3df3ff0

Browse files
fix javadoc errors preventing uploadarchives task running
1 parent 332fec1 commit 3df3ff0

File tree

7 files changed

+121
-10
lines changed

7 files changed

+121
-10
lines changed

AndroidBootstrap/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
apply plugin: 'com.android.library'
2-
apply from: 'https://raw.github.com/chrisbanes/gradle-mvn-push/master/gradle-mvn-push.gradle'
2+
apply from: 'push.gradle'
33

44
android {
55
compileSdkVersion 23

AndroidBootstrap/push.gradle

Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
/*
2+
* Copyright 2013 Chris Banes
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
apply plugin: 'maven'
17+
apply plugin: 'signing'
18+
19+
def isReleaseBuild() {
20+
return VERSION_NAME.contains("SNAPSHOT") == false
21+
}
22+
23+
def getReleaseRepositoryUrl() {
24+
return hasProperty('RELEASE_REPOSITORY_URL') ? RELEASE_REPOSITORY_URL
25+
: "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
26+
}
27+
28+
def getSnapshotRepositoryUrl() {
29+
return hasProperty('SNAPSHOT_REPOSITORY_URL') ? SNAPSHOT_REPOSITORY_URL
30+
: "https://oss.sonatype.org/content/repositories/snapshots/"
31+
}
32+
33+
def getRepositoryUsername() {
34+
return hasProperty('NEXUS_USERNAME') ? NEXUS_USERNAME : ""
35+
}
36+
37+
def getRepositoryPassword() {
38+
return hasProperty('NEXUS_PASSWORD') ? NEXUS_PASSWORD : ""
39+
}
40+
41+
afterEvaluate { project ->
42+
uploadArchives {
43+
repositories {
44+
mavenDeployer {
45+
beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
46+
47+
pom.groupId = GROUP
48+
pom.artifactId = POM_ARTIFACT_ID
49+
pom.version = VERSION_NAME
50+
51+
repository(url: getReleaseRepositoryUrl()) {
52+
authentication(userName: getRepositoryUsername(), password: getRepositoryPassword())
53+
}
54+
snapshotRepository(url: getSnapshotRepositoryUrl()) {
55+
authentication(userName: getRepositoryUsername(), password: getRepositoryPassword())
56+
}
57+
58+
pom.project {
59+
name POM_NAME
60+
packaging POM_PACKAGING
61+
description POM_DESCRIPTION
62+
url POM_URL
63+
64+
scm {
65+
url POM_SCM_URL
66+
connection POM_SCM_CONNECTION
67+
developerConnection POM_SCM_DEV_CONNECTION
68+
}
69+
70+
licenses {
71+
license {
72+
name POM_LICENCE_NAME
73+
url POM_LICENCE_URL
74+
distribution POM_LICENCE_DIST
75+
}
76+
}
77+
78+
developers {
79+
developer {
80+
id POM_DEVELOPER_ID
81+
name POM_DEVELOPER_NAME
82+
}
83+
}
84+
}
85+
}
86+
}
87+
}
88+
89+
signing {
90+
required { isReleaseBuild() && gradle.taskGraph.hasTask("uploadArchives") }
91+
sign configurations.archives
92+
}
93+
94+
task androidJavadocs(type: Javadoc) {
95+
source = android.sourceSets.main.java.srcDirs
96+
classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
97+
}
98+
99+
task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) {
100+
classifier = 'javadoc'
101+
from androidJavadocs.destinationDir
102+
}
103+
104+
task androidSourcesJar(type: Jar) {
105+
classifier = 'sources'
106+
from android.sourceSets.main.java.sourceFiles
107+
}
108+
109+
artifacts {
110+
archives androidSourcesJar
111+
archives androidJavadocsJar
112+
}
113+
}

AndroidBootstrap/src/main/java/com/beardedhen/androidbootstrap/BootstrapBaseThumbnail.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
import static android.widget.ImageView.ScaleType.CENTER_CROP;
2929

3030
/**
31-
* Parent class of Circle & Square Thumbnails - contains boilerplate code required to get
32-
* BootstrapBrand & borders working via getters/setters. Also overrides ImageView so that only
31+
* Parent class of Circle and Square Thumbnails - contains boilerplate code required to get
32+
* BootstrapBrand and borders working via getters/setters. Also overrides ImageView so that only
3333
* CENTER_CROP is allowed, and a callback is fired whenever the image source changes.
3434
*/
3535
abstract class BootstrapBaseThumbnail extends ImageView implements BootstrapBrandView,

AndroidBootstrap/src/main/java/com/beardedhen/androidbootstrap/BootstrapCircleThumbnail.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
/**
2222
* BootstrapCircleThumbnails display a circular image with an optional border, that can be themed
23-
* using BootstrapBrand colors. The view extends ImageView, and will automatically center crop &
23+
* using BootstrapBrand colors. The view extends ImageView, and will automatically center crop and
2424
* scale images.
2525
*/
2626
public class BootstrapCircleThumbnail extends BootstrapBaseThumbnail {
@@ -72,11 +72,9 @@ protected void initialise(AttributeSet attrs) {
7272

7373
/**
7474
* This method is called when the Circle Image needs to be recreated due to changes in size etc.
75-
* <p/>
7675
* A Paint object uses a BitmapShader to draw a center-cropped, circular image onto the View
7776
* Canvas. A Matrix on the BitmapShader scales the original Bitmap to match the current view
7877
* bounds, avoiding any inefficiencies in duplicating Bitmaps.
79-
* <p/>
8078
* <a href="http://www.curious-creature.com/2012/12/11/android-recipe-1-image-with-rounded-corners">
8179
* Further reading</a>
8280
*/

AndroidBootstrap/src/main/java/com/beardedhen/androidbootstrap/api/defaults/DefaultBootstrapHeading.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import com.beardedhen.androidbootstrap.utils.DimenUtils;
99

1010
/**
11-
* Bootstrap provides styling for elements H1-H6, and sets their text size & padding using the
11+
* Bootstrap provides styling for elements H1-H6, and sets their text size and padding using the
1212
* values supplied here.
1313
*/
1414
public enum DefaultBootstrapHeading implements BootstrapHeading {

AndroidBootstrap/src/main/java/com/beardedhen/androidbootstrap/api/view/BootstrapHeadingView.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
import com.beardedhen.androidbootstrap.api.attributes.BootstrapHeading;
66

77
/**
8-
* Views which implement this interface change their text size & padding according to the
8+
* Views which implement this interface change their text size and padding according to the
99
* given Bootstrap Heading
1010
*/
1111
public interface BootstrapHeadingView {
1212

1313
String KEY = "com.beardedhen.androidbootstrap.api.attributes.BootstrapHeading";
1414

1515
/**
16-
* Sets this view to use the given Bootstrap Heading, changing its text size & padding
16+
* Sets this view to use the given Bootstrap Heading, changing its text size and padding
1717
*
1818
* @param bootstrapHeading the Bootstrap Heading
1919
*/

AndroidBootstrap/src/main/java/com/beardedhen/androidbootstrap/font/Typicon.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
/**
1111
* Maps Typicons Icon Codes to unicode characters, allowing its use in AwesomeTextView.
1212
* See the <a href='http://typicons.com/'>Cheatsheet</a> for icon
13-
* code reference. <b>Please note that icon codes have been prefixed with "ty_".
13+
* code reference. <b>Please note that icon codes have been prefixed with "ty_".</b>
1414
* For example, "adjust_brightness" would become "ty_adjust_brightness".
1515
*/
1616
public class Typicon implements IconSet {

0 commit comments

Comments
 (0)