Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 19.3.1 #430

Merged
merged 4 commits into from
Mar 9, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ android:
- tools
- platform-tools
- tools
- build-tools-27.0.3
- android-27
- build-tools-28.0.3
- android-28
licenses:
- 'android-sdk-preview-license-.+'
- 'android-sdk-license-.+'
Expand Down
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
# Release v19.3.1

* MISC: Update dependency versions
* FIX: Netty: call onDisconnect when crossbar not reachable (#418)
* MISC: Remove legacy files (#416)
* FIX: dont send null CloseDetails on transport lost in netty implementation (#414)
* FIX: Fix typo in readStateListener adder (#413)
* NEW: Build (and publish) Android aar as part of the CI (#409)
* NEW: add preliminary WAMP-over-RawSocket implementation (#406)

---

# Release v18.5.2

* FIX: Don't call onLeave listener twice in case of normal GoodBye (#405)
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
BUILD_DATE=$(shell date -u +"%Y-%m-%d")
AUTOBAHN_JAVA_VERSION='18.5.2'
AUTOBAHN_JAVA_VERSION='19.3.1'
AUTOBAHN_JAVA_VCS_REF='unknown'

default:
Expand Down
47 changes: 28 additions & 19 deletions autobahn/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@ def relVersion = System.getenv().containsKey('AUTOBAHN_BUILD_VERSION') ? System.
def siteUrl = 'https://github.com/crossbario/autobahn-java'

dependencies {
api 'com.fasterxml.jackson.core:jackson-core:2.9.5'
api 'com.fasterxml.jackson.core:jackson-core:2.9.8'
//api 'net.sourceforge.streamsupport:streamsupport-cfuture:1.6.2'
implementation 'com.fasterxml.jackson.core:jackson-databind:2.9.5'
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.9.5'
implementation 'com.fasterxml.jackson.core:jackson-databind:2.9.8'
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.9.8'
implementation 'org.msgpack:jackson-dataformat-msgpack:0.8.16'
if (project.IS_ANDROID) {
implementation 'com.github.joshjdevl.libsodiumjni:libsodium-jni-aar:1.0.8'
implementation 'com.github.joshjdevl.libsodiumjni:libsodium-jni-aar:2.0.1'
} else {
implementation 'com.github.joshjdevl.libsodiumjni:libsodium-jni:1.0.8'
implementation 'io.netty:netty-codec-http:4.1.24.Final'
implementation 'io.netty:netty-handler:4.1.24.Final'
implementation 'com.github.joshjdevl.libsodiumjni:libsodium-jni:2.0.1'
implementation 'io.netty:netty-codec-http:4.1.34.Final'
implementation 'io.netty:netty-handler:4.1.34.Final'
}
}

Expand Down Expand Up @@ -63,11 +63,11 @@ bintray {

if (project.IS_ANDROID) {
android {
compileSdkVersion 27
buildToolsVersion '27.0.3'
compileSdkVersion 28
buildToolsVersion '28.0.3'
defaultConfig {
minSdkVersion 24
targetSdkVersion 27
targetSdkVersion 28
}
buildTypes {
release {
Expand Down Expand Up @@ -97,9 +97,15 @@ if (project.IS_ANDROID) {
}

task javadoc(type: Javadoc) {
failOnError false
source = android.sourceSets.main.java.srcDirs
classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
}
afterEvaluate {
javadoc.classpath += files(android.libraryVariants.collect { variant ->
variant.javaCompile.classpath.files
})
}
project.archivesBaseName = project.BUILD_LEGACY ? ARTIFACT_ANDROID_LEGACY: ARTIFACT_ANDROID
group = groupID
version = relVersion
Expand Down Expand Up @@ -138,6 +144,10 @@ if (project.IS_ANDROID) {
}
}
}
task javadocJar(type: Jar, dependsOn: javadoc) {
classifier = 'javadoc'
from javadoc.destinationDir
}
} else {
// Create the pom configuration:
def pomConfig = {
Expand All @@ -159,6 +169,14 @@ if (project.IS_ANDROID) {
url siteUrl
}
}
task sourcesJar(type: Jar, dependsOn: classes) {
classifier = 'sources'
from sourceSets.main.allSource
}
task javadocJar(type: Jar, dependsOn: javadoc) {
classifier = 'javadoc'
from javadoc.destinationDir
}
publishing {
publications {
mavenJava(MavenPublication) {
Expand All @@ -179,10 +197,6 @@ if (project.IS_ANDROID) {
}
}
}
task sourcesJar(type: Jar, dependsOn: classes) {
classifier = 'sources'
from sourceSets.main.allSource
}
sourceSets {
main {
java {
Expand All @@ -199,11 +213,6 @@ if (project.IS_ANDROID) {
targetCompatibility = JavaVersion.VERSION_1_8
}

task javadocJar(type: Jar, dependsOn: javadoc) {
classifier = 'javadoc'
from javadoc.destinationDir
}

artifacts {
archives sourcesJar
archives javadocJar
Expand Down
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.0'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
}
// Android specific dependencies.
if (project.properties.get('buildPlatform', 'android') == 'android') {
dependencies {
classpath 'com.android.tools.build:gradle:3.1.3'
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
classpath 'com.android.tools.build:gradle:3.3.2'
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions demo-gallery/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ apply plugin: project.PLATFORM == project.PLATFORM_NETTY ? project.PLUGIN_JAVA_A

if (plugins.hasPlugin(project.PLUGIN_ANDROID_APP)) {
android {
compileSdkVersion 27
buildToolsVersion '27.0.3'
compileSdkVersion 28
buildToolsVersion '28.0.3'

defaultConfig {
minSdkVersion 24
targetSdkVersion 27
targetSdkVersion 28
}
buildTypes {
release {
Expand All @@ -32,7 +32,7 @@ if (plugins.hasPlugin(project.PLUGIN_ANDROID_APP)) {

dependencies {
implementation project(path: ':autobahn')
implementation 'com.android.support:appcompat-v7:27.1.1'
implementation 'com.android.support:appcompat-v7:28.0.0'
}
} else {
mainClassName = 'io.crossbar.autobahn.demogallery.netty.Main'
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip