diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 2bb52a6d04..e7a8be2d64 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -20,6 +20,10 @@ --> ## Release Notes for AEMM Android ## +### 6.0.9 (Mar 14, 2017) +#### Features +* Includes AEM Mobile .aar version 2017.3 + ### 6.0.8 (Feb 16, 2017) #### Features * Includes AEM Mobile .aar version 2017.2 diff --git a/VERSION b/VERSION index 4353afee02..f1bb5eb883 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -6.0.9-dev +6.0.9 diff --git a/bin/templates/cordova/version b/bin/templates/cordova/version index 7082fbd0ed..b4003effe2 100755 --- a/bin/templates/cordova/version +++ b/bin/templates/cordova/version @@ -20,7 +20,7 @@ */ // Coho updates this line: -var VERSION = "6.0.9-dev"; +var VERSION = "6.0.9"; module.exports.version = VERSION; diff --git a/bin/templates/project/dependencies.gradle b/bin/templates/project/dependencies.gradle index e7439b6638..b11b5d461b 100644 --- a/bin/templates/project/dependencies.gradle +++ b/bin/templates/project/dependencies.gradle @@ -27,7 +27,8 @@ repositories { } dependencies { - compile 'com.android.support:appcompat-v7:23.2.1' // Keep in sync with lib/src/main/project.properties + // Keep in sync with lib/src/main/project.properties + compile 'com.android.support:appcompat-v7:23.2.1' compile 'com.android.support:cardview-v7:23.2.1' compile 'com.android.support:support-v4:23.2.1' compile 'com.android.support:recyclerview-v7:23.2.1' @@ -39,11 +40,13 @@ dependencies { compile 'com.google.guava:guava:18.0' compile 'com.j256.ormlite:ormlite-android:4.48' compile 'net.jcip:jcip-annotations:1.0' - compile 'com.squareup.okhttp:okhttp:2.7.2' + compile 'com.squareup.okhttp3:okhttp:3.4.2' compile 'com.fasterxml.jackson.core:jackson-core:2.5.0' compile 'com.fasterxml.jackson.core:jackson-databind:2.5.0' - compile 'com.github.bumptech.glide:glide:3.6.1' - compile 'com.github.bumptech.glide:okhttp-integration:1.3.1' + compile 'com.github.bumptech.glide:glide:3.7.0' + compile ('com.github.bumptech.glide:okhttp3-integration:1.4.0'){ + exclude group: 'glide-parent' + } compile 'uk.co.chrisjenx:calligraphy:2.2.0' // Keep in sync with root build.gradle @@ -51,7 +54,8 @@ dependencies { compile 'com.adobe.creativesdk.foundation:auth:0.9.978' - compile (name:'adobeMobileLibrary-4.13.2', ext:'jar') // https://github.com/Adobe-Marketing-Cloud/mobile-services + // https://github.com/Adobe-Marketing-Cloud/mobile-services + compile (name:'adobeMobileLibrary-4.13.3', ext:'jar') compile (name:'CordovaLib-release', ext:'aar') diff --git a/bin/templates/project/libs/adobeMobileLibrary-4.13.2.jar b/bin/templates/project/libs/adobeMobileLibrary-4.13.3.jar similarity index 74% rename from bin/templates/project/libs/adobeMobileLibrary-4.13.2.jar rename to bin/templates/project/libs/adobeMobileLibrary-4.13.3.jar index 819cf0c620..243641f026 100644 Binary files a/bin/templates/project/libs/adobeMobileLibrary-4.13.2.jar and b/bin/templates/project/libs/adobeMobileLibrary-4.13.3.jar differ diff --git a/bin/templates/project/libs/aemm-lib-release.aar b/bin/templates/project/libs/aemm-lib-release.aar index ca5c36a5f5..3c9ffcda2b 100644 Binary files a/bin/templates/project/libs/aemm-lib-release.aar and b/bin/templates/project/libs/aemm-lib-release.aar differ diff --git a/framework/src/org/apache/cordova/CordovaWebView.java b/framework/src/org/apache/cordova/CordovaWebView.java index ea1e2408e6..906892fdc8 100644 --- a/framework/src/org/apache/cordova/CordovaWebView.java +++ b/framework/src/org/apache/cordova/CordovaWebView.java @@ -31,7 +31,7 @@ Licensed to the Apache Software Foundation (ASF) under one * are not expected to implement it. */ public interface CordovaWebView { - public static final String CORDOVA_VERSION = "6.0.9-dev"; + public static final String CORDOVA_VERSION = "6.0.9"; void init(CordovaInterface cordova, List pluginEntries, CordovaPreferences preferences); diff --git a/package.json b/package.json index 5643618e64..6d75a040e9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cordova-android", - "version": "6.0.9-dev", + "version": "6.0.9", "description": "aemm-android release", "bin": { "create": "bin/create"