Skip to content

Commit

Permalink
change gradle scripts + bump minsdkversion
Browse files Browse the repository at this point in the history
  • Loading branch information
vekexasia committed Sep 15, 2016
1 parent 04db728 commit 46f5ecc
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 115 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:1.2.3'
classpath 'com.android.tools.build:gradle:2.1.3'
}
}
8 changes: 4 additions & 4 deletions exampleproject/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 21
buildToolsVersion "23.0.0 rc3"
compileSdkVersion 24
buildToolsVersion "24.0.2"
defaultConfig {
targetSdkVersion 20
targetSdkVersion 24
}
sourceSets.main {
manifest.srcFile 'AndroidManifest.xml'
Expand Down Expand Up @@ -37,5 +37,5 @@ android {
}

dependencies {
compile 'com.android.support:appcompat-v7:22.2.0'
compile 'com.android.support:appcompat-v7:24.2.1'
}
115 changes: 5 additions & 110 deletions library/build.gradle
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@

apply plugin: 'com.android.library'
dependencies {
compile 'com.android.support:design:22.2.0'
provided 'com.android.support:design:24.2.1'
}

android {
compileSdkVersion 21
buildToolsVersion "23.0.0 rc3"
compileSdkVersion 24
buildToolsVersion "24.0.2"
defaultConfig {
minSdkVersion 7
targetSdkVersion 22
minSdkVersion 9
targetSdkVersion 24
}
sourceSets {
main {
Expand All @@ -24,109 +24,4 @@ android {
}
}

}
/*
* 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 androidSourcesJar(type: Jar) {
classifier = 'sources'
from android.sourceSets.main.java.sourceFiles
}

artifacts {
archives androidSourcesJar
//archives androidJavadocsJar
}
}

0 comments on commit 46f5ecc

Please sign in to comment.