Merge pull request #59 from microsoftgraph/preview-release

Caitlin Bales (MSFT) · web-flow · commit eea3103b2b12 · 2018-02-26T18:46:47.000-08:00
Preview release
diff --git a/.gitignore b/.gitignore
@@ -32,3 +32,4 @@ hs_err_pid*
 # Maven
 /target/
 /pom.xml
+local.properties
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,3 +1,4 @@
+
 # Contributing to the Microsoft Graph SDK for Java
 
 The Microsoft Graph SDK is available for all manner of contribution. There are a couple of different recommended paths to get contributions into the released version of this SDK.
@@ -22,3 +23,24 @@ Revisions of this nature will result in a 0.X.X change of the version number.
 
 ## Submit pull requests for model or request files
 You can revise code in the extension folders of these folders. See [Extending the Library](https://github.com/microsoftgraph/msgraph-sdk-java/wiki/Extending-the-Library) for more information on how to work with the generated parts of the library.
+
+## Add yourself as a contributor
+
+This project follows the [all contributors](https://github.com/kentcdodds/all-contributors) specification. When making a contribution, please add yourself to the table of contributors:
+
+ 1. In section 7. of the [README.md](https://github.com/microsoftgraph/msgraph-sdk-java/blob/master/README.md), after the last "|", copy and paste a new blank contributor element
+    ```html
+    [<img src="https://avatars.githubusercontent.com/u/<your-uid>?v=4" width="100px;"/><br />
+    <sub><b>Your Name</b></sub>](your website or github page)<br />
+    [emoji](link "alt-text") |
+    ```
+
+    You can get your GitHub UID by inspecting your GitHub avatar image.
+
+2. For each contribution type (see [emoji key](https://github.com/kentcdodds/all-contributors#emoji-key) for a list of contribution types), add an emoji and a relevant link and alt-text.
+    
+    For example, if you write a blogpost on how to use the SDK, you would include:
+    
+	```html
+	    [📝]("https://myblog.com/using-the-java-sdk" "Blog Post")
+	```
diff --git a/README.md b/README.md
@@ -1,22 +1,11 @@
 # Preview Microsoft Graph SDK for Java
-
-This client library is currently in private preview status. This means that: 
-- The API surface may change significantly.
-- Non-blocking issues *may* be triaged at a slower pace.
-- You may submit feedback through issues or PRs. You will have a better chance of your changes being implemented if they are submitted before public preview release.
-- We do not define an SLA or support strategy for this library.
-
-We welcome your feedback as we drive the quality of this to general availability.
+*This SDK is currently in preview. Please continue to provide [feedback](https://github.com/microsoftgraph/msgraph-sdk-java/issues/new) as we iterate towards a production-supported library.*
 
 Get started with the Microsoft Graph SDK for Java by integrating the [Microsoft Graph API](https://graph.microsoft.io/en-us/getting-started) into your Java application!
 
 ## 1. Installation
 
 ### 1.1 Install via Gradle
-
-> [!NOTE] 
-> This package will not be available via Gradle until it is in public preview. You need to download the source and reference the package locally.
-
 Add the JCenter repository and a compile dependency for `microsoft-graph` to your project's `build.gradle`:
 
 ```gradle
@@ -26,7 +15,7 @@ repository {
 
 dependency {
     // Include the sdk as a dependency
-    compile('com.microsoft.graph:msgraph-sdk-java:1.0.+')
+    compile('com.microsoft.graph:microsoft-graph:0.1.+')
 }
 ```
 
@@ -46,9 +35,6 @@ An instance of the **GraphServiceClient** class handles building requests, sendi
 For an example of authentication in a client application, see the [MSGraph SDK Android MSA Auth for Android Adapter](https://github.com/microsoftgraph/msgraph-sdk-android-msa-auth-for-android-adapter).
 
 ### 2.3 Get a GraphServiceClient object
-
-<!--TODO: the following para needs expansion or removal. Would need to mention the different flows (authorization code flow, implicit flow, client credential flow) and give pointers on where to get sample code. Dave Moten can provide link for client credentials flow.-->
-
 After you have set the correct application ID and URL, you must get a **GraphServiceClient** object to make requests against the service. The SDK stores the account information for you, but when a user signs in for the first time, it invokes the UI to get the user's account information.
 
 ```java
@@ -106,6 +92,17 @@ For known issues, see [issues](https://github.com/MicrosoftGraph/msgraph-sdk-jav
 
 The Microsoft Graph SDK is open for contribution. To contribute to this project, see [Contributing](https://github.com/microsoftgraph/msgraph-sdk-java/blob/master/CONTRIBUTING.md).
 
+Thanks to everyone who has already devoted time to improving the library:
+
+<!-- ALL-CONTRIBUTORS-LIST:START  -->
+<!-- prettier-ignore -->
+| [<img src="https://avatars.githubusercontent.com/u/2273297?v=4" width="100px;"/><br /><sub><b>Caitlin Bales</b></sub>](https://developer.microsoft.com/graph)<br />[💬](#question-cbales "Answering Questions") [💻](https://github.com/microsoftgraph/msgraph-sdk-java/commits?author=cbales "Code") [📖](https://github.com/microsoftgraph/msgraph-sdk-java/wiki "Documentation") [👀](#review-cbales "Reviewed Pull Requests") [⚠️](https://github.com/microsoftgraph/msgraph-sdk-java/commits?author=cbales "Tests")| [<img src="https://avatars.githubusercontent.com/u/318187?v=4" width="100px;"/><br /><sub><b>David Moten</b></sub>](https://github.com/davidmoten)<br /> [🐛](https://github.com/microsoftgraph/msgraph-sdk-java/issues?q=is%3Aissue+author%3Adavidmoten "Bug reports") [💻](https://github.com/microsoftgraph/msgraph-sdk-java/commits?author=davidmoten "Code") [📖](https://github.com/microsoftgraph/msgraph-sdk-java/commit/87389b5a4240072e3f2226a2f04f089916ffed0b#diff-04c6e90faac2675aa89e2176d2eec7d8 "Documentation") [🤔](#ideas-davidmoten "Ideas & Planning") [👀](#review-davidmoten "Reviewed Pull Requests") [⚠️](https://github.com/microsoftgraph/msgraph-sdk-java/commits?author=davidmoten "Tests") | [<img src="https://avatars.githubusercontent.com/u/8527305?v=4" width="100px;"/><br /><sub><b>Michael Mainer</b></sub>](https://developer.microsoft.com/graph)<br /> [💬](#question-cbales "Answering Questions") [🤔](#ideas-MIchaelMainer "Ideas & Planning") [👀](#review-MIchaelMainer "Reviewed Pull Requests") | [<img src="https://avatars.githubusercontent.com/u/27295799?v=4" width="100px;"/><br /><sub><b>Linda Caputo</b></sub>](https://developer.microsoft.com/graph)<br />[📖](https://github.com/microsoftgraph/msgraph-sdk-java/wiki "Documentation") | [<img src="https://avatars.githubusercontent.com/u/8884923?v=4" width="100px;"/><br /><sub><b>John Austin</b></sub>](https://developer.microsoft.com/graph)<br />[🐛](https://github.com/microsoftgraph/msgraph-sdk-java/issues "Bug reports") | [<img src="https://avatars.githubusercontent.com/u/3460953?v=4" width="100px;"/><br /><sub><b>Dmitry Pimenov</b></sub>](https://developer.microsoft.com/graph)<br />[🤔](#ideas-dpim "Ideas & Planning") | [<img src="https://avatars.githubusercontent.com/u/1427840?v=4" width="100px;"/><br /><sub><b>Jonathan Giles</b></sub>](https://github.com/JonathanGiles)<br />[🤔](#ideas-JonathanGiles "Ideas & Planning") |
+| :---: | :---: | :---: | :---: | :---: | :---: | :---: |
+|  [<img src="https://avatars.githubusercontent.com/u/881767?v=4" width="100px;"/><br /><sub><b>Martin Sawicki</b></sub>](https://github.com/martinsawicki)<br />[🤔](#ideas-martinsawicki "Ideas & Planning") | [<img src="https://avatars.githubusercontent.com/u/29152134?v=4" width="100px;"/><br /><sub><b>Louis Maresca</b></sub>](https://github.com/LouMM)<br />[🤔](#ideas-LouMM "Ideas & Planning") [👀](#review-LouMM "Reviewed Pull Requests") |
+<!-- ALL-CONTRIBUTORS-LIST:END -->
+
+This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind are welcome!
+
 ## 7. Supported Java versions
 The Microsoft Graph SDK for Java library is supported at runtime for Java 7+ and [Android API revision 15](http://source.android.com/source/build-numbers.html) and greater.
 
diff --git a/build.gradle b/build.gradle
@@ -10,6 +10,7 @@
 apply plugin: 'java-library'
 apply plugin: 'java'
 apply plugin: 'eclipse'
+apply plugin: 'maven'
 apply plugin: 'maven-publish'
 
 // In this section you declare where to find the dependencies of your project
@@ -38,7 +39,7 @@ publishing {
     publications {
         maven(MavenPublication) {
             groupId 'com.microsoft.graph'
-            artifactId 'msgraph-sdk-java'
+            artifactId 'microsoft-graph'
             version '0.1-SNAPSHOT'
 
             from components.java
@@ -53,3 +54,61 @@ task sourceJar(type: Jar) {
   from sourceSets.main.allJava
 }
 
+def getVersionCode() {
+    return mavenMajorVersion.toInteger() * 10000 + mavenMinorVersion.toInteger() * 100 + mavenPatchVersion.toInteger()
+}
+
+def getVersionName() {
+    return "${mavenMajorVersion}.${mavenMinorVersion}.${mavenPatchVersion}"
+}
+
+uploadArchives {
+
+    def bintrayUsername = ""
+
+    def bintrayApikey = ""
+
+    if (project.rootProject.file('local.properties').exists()) {
+
+        Properties properties = new Properties()
+
+        properties.load(project.rootProject.file('local.properties').newDataInputStream())
+
+        bintrayUsername = properties.getProperty('bintray.user')
+
+        bintrayApikey = properties.getProperty('bintray.apikey')
+
+    }
+
+    configuration = configurations.archives
+
+    repositories.mavenDeployer {
+
+        pom {
+
+           setGroupId project.mavenGroupId
+
+           setArtifactId project.mavenArtifactId
+
+           setVersion getVersionName()
+
+        }
+
+        repository (url: project.mavenRepoUrl) {
+
+            authentication(
+
+                 // put these values in local file ~/.gradle/gradle.properties
+
+                 userName: project.hasProperty("bintrayUsername") ? project.bintrayUsername : bintrayUsername,
+
+                 password: project.hasProperty("bintrayApikey") ? project.bintrayApikey : bintrayApikey
+
+            )
+
+        }
+
+    }
+
+}
+
diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 # Project-wide Gradle settings.
 
-# IDE (e.g. Android Studio) users:
+# IDE users:
 # Settings specified in this file will override any Gradle settings
 # configured through the IDE.
 
@@ -16,13 +16,15 @@
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
+
+# The size of the library demands a large amount of RAM to build. Increase as necessary if you get GC errors
 org.gradle.jvmargs=-XX:MaxPermSize=512m -Xmx4g
 
-mavenRepoUrl         = https://api.bintray.com/maven/microsoftgraph/Maven/msgraph-sdk-android
+mavenRepoUrl         = https://api.bintray.com/maven/microsoftgraph/Maven/microsoft-graph
 mavenGroupId         = com.microsoft.graph
-mavenArtifactId      = msgraph-sdk-android
-mavenMajorVersion    = 1
-mavenMinorVersion    = 4
+mavenArtifactId      = microsoft-graph
+mavenMajorVersion    = 0
+mavenMinorVersion    = 1
 mavenPatchVersion    = 0
 nightliesUrl         = http://dl.bintray.com/MicrosoftGraph/Maven
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -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-3.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.5.1-bin.zip
diff --git a/src/test/java/com/microsoft/graph/functional/PlannerTests.java b/src/test/java/com/microsoft/graph/functional/PlannerTests.java
@@ -36,7 +36,7 @@
 import java.util.Calendar;
 import java.util.UUID;
 
-//@Ignore
+@Ignore
 public class PlannerTests {
     private static TestBase testBase;
     // For now, you must specify a specific plan ID since the test cannot
