From 756d05241183f9891920e464d7270b4975168f61 Mon Sep 17 00:00:00 2001 From: Marcos Torres Date: Thu, 20 Nov 2014 18:05:20 -0300 Subject: [PATCH] version bump and minor changes to gradle scripts --- sdk/android-libraries.gradle | 4 ++-- sdk/build.gradle | 10 +++++----- sdk/file-services/build.gradle | 1 - sdk/java-libraries.gradle | 10 ++++++---- sdk/odata-engine-core/build.gradle | 4 +++- 5 files changed, 16 insertions(+), 13 deletions(-) diff --git a/sdk/android-libraries.gradle b/sdk/android-libraries.gradle index 218e302d..e012cb6d 100644 --- a/sdk/android-libraries.gradle +++ b/sdk/android-libraries.gradle @@ -4,9 +4,9 @@ def myProject = project uploadArchives { repositories.mavenDeployer { - pom.groupId = myProject.groupId + pom.groupId = myProject.group pom.artifactId = PUBLISH_ARTIFACT_ID - pom.version = myProject.sdkVersion + pom.version = myProject.version repository ( url: 'https://api.bintray.com/maven/msopentech/Maven/Office-365-SDK-for-Android' ) { diff --git a/sdk/build.gradle b/sdk/build.gradle index 6d7fc733..081cabdf 100644 --- a/sdk/build.gradle +++ b/sdk/build.gradle @@ -12,12 +12,12 @@ buildscript { } allprojects { - project.ext{ - desc = 'Office 365 Android SDK' - sdkVersion = '0.9.3' - groupId = 'com.microsoft.services' - } + repositories { jcenter() } + + apply plugin: 'idea' + group = 'com.microsoft.services' + version = '0.9.4' } diff --git a/sdk/file-services/build.gradle b/sdk/file-services/build.gradle index 8733eed3..c6912b4c 100644 --- a/sdk/file-services/build.gradle +++ b/sdk/file-services/build.gradle @@ -1,5 +1,4 @@ apply plugin: 'java' -apply plugin: 'eclipse' dependencies { compile project(':odata-engine-core') diff --git a/sdk/java-libraries.gradle b/sdk/java-libraries.gradle index 73174265..16571f2b 100644 --- a/sdk/java-libraries.gradle +++ b/sdk/java-libraries.gradle @@ -48,7 +48,7 @@ bintray { configurations = ['published'] //When uploading configuration files apiUrl = "https://api.bintray.com" user = 'user' - key = 'key' + key = 'foo' dryRun = false filesSpec { @@ -73,10 +73,12 @@ bintray { attributes = ['plat': ['android', 'java']] publicDownloadNumbers = true + def ver = myProject.version + version { - name = myProject.sdkVersion //Optional logical version name - desc = myProject.desc - vcsTag = myProject.sdkVersion + name = ver //Optional logical version name + desc = 'Office 365 Android SDK for Android' + vcsTag = ver } } } diff --git a/sdk/odata-engine-core/build.gradle b/sdk/odata-engine-core/build.gradle index f6cdb164..3aaf52a0 100644 --- a/sdk/odata-engine-core/build.gradle +++ b/sdk/odata-engine-core/build.gradle @@ -4,4 +4,6 @@ dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) compile 'com.google.guava:guava:18.0' compile 'com.google.code.gson:gson:2.3' -} \ No newline at end of file +} + +apply from :'../java-libraries.gradle' \ No newline at end of file