diff --git a/ShortcutBadger/build.gradle b/ShortcutBadger/build.gradle index 34e2a24..e4e6785 100644 --- a/ShortcutBadger/build.gradle +++ b/ShortcutBadger/build.gradle @@ -2,12 +2,12 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 19 - buildToolsVersion "20.0.0" + compileSdkVersion 23 + buildToolsVersion "23.0.3" defaultConfig { minSdkVersion 8 - targetSdkVersion 19 + targetSdkVersion 23 versionCode 1 versionName "1.0" consumerProguardFiles 'proguard-rules.pro' @@ -17,7 +17,4 @@ android { abortOnError false } -} - -//apply from: 'https://raw.github.com/chrisbanes/gradle-mvn-push/master/gradle-mvn-push.gradle' -apply from: './mvn-push.gradle' +} \ No newline at end of file diff --git a/ShortcutBadger/mvn-push.gradle b/ShortcutBadger/mvn-push.gradle index 7b2d95c..e69de29 100644 --- a/ShortcutBadger/mvn-push.gradle +++ b/ShortcutBadger/mvn-push.gradle @@ -1,114 +0,0 @@ -/* - * Copyright 2013 Chris Banes - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -apply plugin: 'maven' -apply plugin: 'signing' - -def isReleaseBuild() { - return VERSION_NAME.contains("SNAPSHOT") == false -} - -def getReleaseRepositoryUrl() { - return hasProperty('RELEASE_REPOSITORY_URL') ? RELEASE_REPOSITORY_URL - : "https://oss.sonatype.org/service/local/staging/deploy/maven2/" -} - -def getSnapshotRepositoryUrl() { - return hasProperty('SNAPSHOT_REPOSITORY_URL') ? SNAPSHOT_REPOSITORY_URL - : "https://oss.sonatype.org/content/repositories/snapshots/" -} - -def getRepositoryUsername() { - return hasProperty('NEXUS_USERNAME') ? NEXUS_USERNAME : "" -} - -def getRepositoryPassword() { - return hasProperty('NEXUS_PASSWORD') ? NEXUS_PASSWORD : "" -} - -afterEvaluate { project -> - uploadArchives { - repositories { - mavenDeployer { - beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) } - - pom.groupId = GROUP - pom.artifactId = POM_ARTIFACT_ID - pom.version = VERSION_NAME - - repository(url: getReleaseRepositoryUrl()) { - authentication(userName: getRepositoryUsername(), password: getRepositoryPassword()) - } - snapshotRepository(url: getSnapshotRepositoryUrl()) { - authentication(userName: getRepositoryUsername(), password: getRepositoryPassword()) - } - - pom.project { - name POM_NAME - packaging POM_PACKAGING - description POM_DESCRIPTION - url POM_URL - - scm { - url POM_SCM_URL - connection POM_SCM_CONNECTION - developerConnection POM_SCM_DEV_CONNECTION - } - - licenses { - license { - name POM_LICENCE_NAME - url POM_LICENCE_URL - distribution POM_LICENCE_DIST - } - } - - developers { - developer { - id POM_DEVELOPER_ID - name POM_DEVELOPER_NAME - } - } - } - } - } - } - - signing { - required { isReleaseBuild() && gradle.taskGraph.hasTask("uploadArchives") } - sign configurations.archives - } - - task androidJavadocs(type: Javadoc) { - source = android.sourceSets.main.java.srcDirs - classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) - } - - task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) { - classifier = 'javadoc' - from androidJavadocs.destinationDir - } - - task androidSourcesJar(type: Jar) { - classifier = 'sources' - from android.sourceSets.main.java.sourceFiles - } - - artifacts { - archives androidSourcesJar - archives androidJavadocsJar - } -} \ No newline at end of file diff --git a/ShortcutBadger/src/main/java/me/leolin/shortcutbadger/ShortcutBadger.java b/ShortcutBadger/src/main/java/me/leolin/shortcutbadger/ShortcutBadger.java index c5125ac..0894921 100644 --- a/ShortcutBadger/src/main/java/me/leolin/shortcutbadger/ShortcutBadger.java +++ b/ShortcutBadger/src/main/java/me/leolin/shortcutbadger/ShortcutBadger.java @@ -52,7 +52,7 @@ public final class ShortcutBadger { applyCountOrThrow(context, badgeCount); return true; } catch (ShortcutBadgeException e) { - Log.e(LOG_TAG, "Unable to execute badge", e); +// Log.e(LOG_TAG, "Unable to execute badge", e); return false; } } diff --git a/build.gradle b/build.gradle index e6fc6c8..e69de29 100644 --- a/build.gradle +++ b/build.gradle @@ -1,32 +0,0 @@ -buildscript { - repositories { - mavenCentral() - } - dependencies { - classpath 'com.android.tools.build:gradle:2.1.2' - } - ext { - POM_NAME = 'Shortcutbadger' - POM_PACKAGING = 'aar' - POM_ARTIFACT_ID = 'shortcutbadger' - VERSION_NAME = '1.1.8' - VERSION_CODE = 1 - GROUP = 'me.leolin' - } -} - - -subprojects { - buildscript { - repositories { - mavenCentral() - } - dependencies { - classpath 'com.android.tools.build:gradle:2.1.2' - } - } - repositories { - mavenCentral() - } - -} \ No newline at end of file