Skip to content

Commit

Permalink
Use the new release script and release version 2.1.2
Browse files Browse the repository at this point in the history
  • Loading branch information
yanzhenjie committed Jul 3, 2020
1 parent 2ef671b commit 8dcb7c0
Show file tree
Hide file tree
Showing 54 changed files with 155 additions and 3,822 deletions.
11 changes: 0 additions & 11 deletions annotation/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,4 @@ apply from: '../publish.gradle'
compileJava {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

version = bintray.version

uploadArchives {
repositories {
mavenDeployer {
pom.groupId = bintray.group
pom.artifactId = 'annotation'
}
}
}
3 changes: 3 additions & 0 deletions annotation/gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
POM_NAME=AndServer
POM_ARTIFACT_ID=annotation
POM_PACKAGING=jar
13 changes: 1 addition & 12 deletions api/build.gradle
Original file line number Diff line number Diff line change
@@ -1,17 +1,6 @@
apply plugin: plugin.androidLibrary
apply from: '../publish.gradle'

version = bintray.version

uploadArchives {
repositories {
mavenDeployer {
pom.groupId = bintray.group
pom.artifactId = 'api'
}
}
}

android {
compileSdkVersion androidBuild.compileSdkVersion
buildToolsVersion androidBuild.buildToolsVersion
Expand All @@ -31,7 +20,7 @@ android {
}

dependencies {
api deps.project.annotation
api project(':annotation')

implementation deps.apache.httpcore
implementation deps.apache.fileupload
Expand Down
3 changes: 3 additions & 0 deletions api/gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
POM_NAME=AndServer
POM_ARTIFACT_ID=api
POM_PACKAGING=aar
6 changes: 2 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,8 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:3.6.2'
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
classpath 'com.yanzhenjie.andserver:plugin:2.1.1'
classpath 'com.android.tools.build:gradle:3.6.3'
classpath 'com.yanzhenjie.andserver:plugin:2.1.2'
}
}

Expand Down
36 changes: 6 additions & 30 deletions config.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,46 +21,22 @@ ext {
sampleTargetSdkVersion : 22,

versionCode : 25,
versionName : '2.1.1'
]

bintray = [
version : '2.1.1',
group : 'com.yanzhenjie.andserver',

siteUrl : 'https://github.com/yanzhenjie/AndServer',
gitUrl : '[email protected]:yanzhenjie/AndServer.git',

packaging : 'aar',
name : 'AndServer',
description : 'Android web server',

licenseName : 'The Apache Software License, Version 2.0',
licenseUrl : 'http://www.apache.org/licenses/LICENSE-2.0.txt',

developerId : 'yanzhenjie',
developerName : 'yanzhenjie',
developerEmail: '[email protected]',

binrayLibrary : "",
bintrayRepo : "maven",
bintrayUser : 'yolanda',
bintrayLicense: "Apache-2.0"
versionName : '2.1.2'
]

deps = [
android: [
plugin : 'com.android.tools.build:gradle:3.6.2',
plugin : 'com.android.tools.build:gradle:3.6.3',
annotation: 'androidx.annotation:annotation:1.1.0',
compat : 'androidx.appcompat:appcompat:1.1.0',
material : 'com.google.android.material:material:1.1.0',
],

project: [
annotation: "${bintray.group}:annotation:${bintray.version}",
api : "${bintray.group}:api:${bintray.version}",
processor : "${bintray.group}:processor:${bintray.version}",
plugin : "${bintray.group}:plugin:${bintray.version}"
annotation: "${PROJECT_GROUP}:annotation:${PROJECT_VERSION}",
api : "${PROJECT_GROUP}:api:${PROJECT_VERSION}",
processor : "${PROJECT_GROUP}:processor:${PROJECT_VERSION}",
plugin : "${PROJECT_GROUP}:plugin:${PROJECT_VERSION}"
],

apache : [
Expand Down
19 changes: 18 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1 +1,18 @@
android.useAndroidX=true
android.useAndroidX=true

PROJECT_GROUP=com.yanzhenjie.andserver
PROJECT_VERSION=2.1.2

POM_DESCRIPTION=Android web server.

POM_URL=https://github.com/yanzhenjie/AndServer/
POM_SCM_URL=https://github.com/yanzhenjie/AndServer/
POM_SCM_CONNECTION=scm:git:git://github.com/yanzhenjie/AndServer.git
POM_SCM_DEV_CONNECTION=scm:git:ssh://[email protected]/yanzhenjie/AndServer.git

POM_LICENCE_NAME=The Apache Software License, Version 2.0
POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
POM_LICENCE_DIST=repo

POM_DEVELOPER_ID=yanzhenjie
POM_DEVELOPER_NAME=Zhenjie Yan
16 changes: 2 additions & 14 deletions plugin/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,10 @@ compileJava {
targetCompatibility = JavaVersion.VERSION_1_8
}

version = bintray.version

uploadArchives {
repositories {
mavenDeployer {
pom.groupId = bintray.group
pom.artifactId = 'plugin'
}
}
}

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])

compileOnly gradleApi()
implementation deps.project.annotation
api project(':annotation')

implementation deps.android.plugin
implementation deps.poet
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
21 changes: 0 additions & 21 deletions plugin/build/docs/javadoc/allclasses-frame.html

This file was deleted.

21 changes: 0 additions & 21 deletions plugin/build/docs/javadoc/allclasses-noframe.html

This file was deleted.

Loading

0 comments on commit 8dcb7c0

Please sign in to comment.