Merge pull request #101 from optimizely/devel

merge devel into master.

Author: wangjoshuah

.travis.yml

@@ -21,4 +21,4 @@ branches:
   only:
   - master
   - devel
-  - /^\d+\.\d+\.\d+(-SNAPSHOT)?$/ # trigger builds on tags which are semantically versioned to ship the SDK.
+  - /^\d+\.\d+\.\d+(-SNAPSHOT)?$/ # trigger builds on tags which are semantically versioned to ship the SDK.

CONTRIBUTING.md

@@ -4,13 +4,13 @@ We welcome contributions and feedback! All contributors must sign our [Contribut
 
 ## Development process
 
-1. Create a branch off of `devel`: `git checkout -b YOUR_NAME/branch_name`.
+1. Create a branch off of `master`: `git checkout -b YOUR_NAME/branch_name`.
 2. Commit your changes. Make sure to add tests!
-3. Run `./gradlew clean check` to make sure there are no possible bugs.
+3. Run `./gradlew clean check` to automatically catch potential bugs.
 4. `git push` your changes to GitHub.
-5. Make sure that all unit tests are passing and that there are no merge conflicts between your branch and `devel`.
-6. Open a pull request from `YOUR_NAME/branch_name` to `devel`.
-7. A repository maintainer will review your pull request and, if all goes well, merge it!
+5. Make sure that all unit tests are passing and that there are no merge conflicts between your branch and `master`.
+6. Open a pull request from `YOUR_NAME/branch_name` to `master`.
+7. A repository maintainer will review your pull request and, if all goes well, squash and merge it!
 
 ## Pull request acceptance criteria
 
@@ -25,28 +25,28 @@ Refer to the [Google Java Style Guide](https://google.github.io/styleguide/javag
 
 ## License
 
-By contributing your code, you agree to license your contribution under the terms of the
-[Apache License v2.0](http://www.apache.org/licenses/LICENSE-2.0).
-Your contributions should also include the following header:
+All contributions are under the CLA mentioned above. For this project, Optimizely uses the Apache 2.0 license, and so asks that by contributing your code, you agree to license your contribution under the terms of the [Apache License v2.0](http://www.apache.org/licenses/LICENSE-2.0). Your contributions should also include the following header:
 
 ```
-/**
- * Copyright 2016, Optimizely
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+/****************************************************************************
+ * Copyright YEAR, Optimizely, Inc. and contributors                        *
+ *                                                                          *
+ * Licensed under the Apache License, Version 2.0 (the "License");          *
+ * you may not use this file except in compliance with the License.         *
+ * You may obtain a copy of the License at                                  *
+ *                                                                          *
+ *    http://www.apache.org/licenses/LICENSE-2.0                            *
+ *                                                                          *
+ * Unless required by applicable law or agreed to in writing, software      *
+ * distributed under the License is distributed on an "AS IS" BASIS,        *
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. *
+ * See the License for the specific language governing permissions and      *
+ * limitations under the License.                                           *
+ ***************************************************************************/
  ```
 
+The YEAR above should be the year of the contribution. If work on the file has been done over multiple years, list each year in the section above. Example: Optimizely writes the file and releases it in 2014. No changes are made in 2015. Change made in 2016. YEAR should be “2014, 2016”.
+
 ## Contact
 
-If you have questions, please contact developers@optimizely.com.
+If you have questions, please contact developers@optimizely.com.

build.gradle

@@ -8,7 +8,6 @@ buildscript {
 
     dependencies {
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.6'
-        classpath 'nl.javadude.gradle.plugins:license-gradle-plugin:latest.release'
     }
 }
 
@@ -19,9 +18,9 @@ plugins {
 
 allprojects {
     group = 'com.optimizely.ab'
+    apply plugin: 'idea'
 }
 
-apply from: 'gradle/license.gradle'
 apply from: 'gradle/publish.gradle'
 
 allprojects {