From 16ee0edea83ab2ec309f40ab61395683334c4811 Mon Sep 17 00:00:00 2001 From: Max Lv Date: Wed, 27 Dec 2017 00:55:26 -0800 Subject: [PATCH] Bump version --- core/src/main/jni/shadowsocks-libev | 2 +- mobile/build.gradle | 4 +- plugin/build.gradle | 2 + plugin/gradle-mvn-push.gradle | 136 ++++++++++++++++++++++++++++ 4 files changed, 141 insertions(+), 3 deletions(-) create mode 100644 plugin/gradle-mvn-push.gradle diff --git a/core/src/main/jni/shadowsocks-libev b/core/src/main/jni/shadowsocks-libev index b26cbc27..5072be7a 160000 --- a/core/src/main/jni/shadowsocks-libev +++ b/core/src/main/jni/shadowsocks-libev @@ -1 +1 @@ -Subproject commit b26cbc2755908926898eb39b5351431f7f1252d1 +Subproject commit 5072be7a02f58c4792ac6c69ccd566a2be1fdcf0 diff --git a/mobile/build.gradle b/mobile/build.gradle index d2a6c93d..6ac0de3e 100644 --- a/mobile/build.gradle +++ b/mobile/build.gradle @@ -20,8 +20,8 @@ android { applicationId "com.github.shadowsocks" minSdkVersion rootProject.minSdkVersion targetSdkVersion rootProject.sdkVersion - versionCode 202 - versionName "4.4.2" + versionCode 203 + versionName "4.4.3" testApplicationId "com.github.shadowsocks.test" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary true diff --git a/plugin/build.gradle b/plugin/build.gradle index 2ac7df80..6c9c6336 100644 --- a/plugin/build.gradle +++ b/plugin/build.gradle @@ -1,6 +1,8 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' +apply from: 'gradle-mvn-push.gradle' + android { buildToolsVersion rootProject.buildToolsVersion compileSdkVersion rootProject.sdkVersion diff --git a/plugin/gradle-mvn-push.gradle b/plugin/gradle-mvn-push.gradle new file mode 100644 index 00000000..b02919a7 --- /dev/null +++ b/plugin/gradle-mvn-push.gradle @@ -0,0 +1,136 @@ +/* + * 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' + +@SuppressWarnings(["GroovyUnusedDeclaration", "GrMethodMayBeStatic"]) +def isReleaseBuild() { + return !android.defaultConfig.versionName.contains("SNAPSHOT") +} + +@SuppressWarnings("GroovyUnusedDeclaration") +def getReleaseRepositoryUrl() { + return hasProperty('RELEASE_REPOSITORY_URL') ? RELEASE_REPOSITORY_URL + : "https://oss.sonatype.org/service/local/staging/deploy/maven2/" +} + +@SuppressWarnings("GroovyUnusedDeclaration") +def getSnapshotRepositoryUrl() { + return hasProperty('SNAPSHOT_REPOSITORY_URL') ? SNAPSHOT_REPOSITORY_URL + : "https://oss.sonatype.org/content/repositories/snapshots/" +} + +@SuppressWarnings("GroovyUnusedDeclaration") +def getRepositoryUsername() { + return hasProperty('NEXUS_USERNAME') ? NEXUS_USERNAME : "" +} + +@SuppressWarnings("GroovyUnusedDeclaration") +def getRepositoryPassword() { + return hasProperty('NEXUS_PASSWORD') ? NEXUS_PASSWORD : "" +} + +afterEvaluate { project -> + uploadArchives { + repositories { + mavenDeployer { + beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) } + + pom.groupId = 'com.github.shadowsocks' + pom.artifactId = 'plugin' + pom.version = android.defaultConfig.versionName + + repository(url: getReleaseRepositoryUrl()) { + authentication(userName: getRepositoryUsername(), password: getRepositoryPassword()) + } + snapshotRepository(url: getSnapshotRepositoryUrl()) { + authentication(userName: getRepositoryUsername(), password: getRepositoryPassword()) + } + + pom.project { + name 'Shadowsocks Plugin' + packaging 'aar' + description 'Shadowsocks Plugin' + url 'https://github.com/shadowsocks/shadowsocks-android' + + scm { + url 'https://github.com/shadowsocks/shadowsocks-android.git' + connection 'scm:git:git://github.com/shadowsocks/shadowsocks-android.git' + developerConnection 'scm:git:git@github.com:shadowsocks/shadowsocks-android.git' + } + + licenses { + license { + name 'GPLv3' + url 'https://www.gnu.org/licenses/gpl-3.0.html' + distribution 'repo' + } + } + + developers { + developer { + id 'madeye' + name 'Max Lv' + url 'https://github.com/madeye' + } + developer { + id 'Mygod' + name 'Mygod Studio' + url 'https://github.com/Mygod' + } + } + } + } + } + } + + signing { + required { isReleaseBuild() && gradle.taskGraph.hasTask("uploadArchives") } + sign configurations.archives + } + + android.libraryVariants.all { variant -> + def javadocTask = task("generate${variant.name.capitalize()}Javadoc", type: Javadoc) { + description "Generates Javadoc for $variant.name." + source = variant.javaCompiler.source + ext.androidJar = project.files(android.getBootClasspath().join(File.pathSeparator)) + classpath = files(variant.javaCompiler.classpath.files) + files(ext.androidJar) + exclude '**/BuildConfig.java' + exclude '**/R.java' + } + + javadocTask.dependsOn variant.javaCompiler + + def jarJavadocTask = task("jar${variant.name.capitalize()}Javadoc", type: Jar) { + description "Generate Javadoc Jar for $variant.name" + classifier = 'javadoc' + from javadocTask.destinationDir + } + + jarJavadocTask.dependsOn javadocTask + artifacts.add('archives', jarJavadocTask) + + def jarSourceTask = task("jar${variant.name.capitalize()}Sources", type: Jar) { + description "Generates Java Sources for $variant.name." + classifier = 'sources' + from variant.javaCompiler.source + } + + jarSourceTask.dependsOn variant.javaCompiler + artifacts.add('archives', jarSourceTask) + } +}