version bump and minor changes to gradle scripts

OfficeDev · Nov 20, 2014 · 756d052 · 756d052
1 parent e96fcde
commit 756d052
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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'
-}
+}
+
+apply from :'../java-libraries.gradle'