Merge pull request #45 from conan-io/release/1.1.2

Release 1.1.2

.gitignore

@@ -2,3 +2,7 @@
 *.iml
 .gradle
 build/
+.classpath
+.project
+.settings/
+bin/

.travis.yml

@@ -1,18 +1,73 @@
-os:
-  - osx
-  - linux
+sudo: false
 language: java
+dist: xenial
+
+stages:
+  - name: checks
+    if: tag IS present
+  - test
+  - name: deploy
+    if: tag IS present
+
+jobs:
+  fast_finish: true
+  include:
+
+    - stage: checks
+      name: "Check version"
+      addons:
+      before_install: true
+      install: true
+      script:
+        # Check that the version value matches the tag one (right at the very beginning)
+        - version=$(sed -e '/^pluginVersion = */!d; s///;q' gradle.properties) || travis_terminate 1;
+        - echo "Value found in gradle.properties=$version, tag is $TRAVIS_TAG"
+        - if [ "$version" != "$TRAVIS_TAG" ]; then echo "Version mismatch!"; travis_terminate 1; fi
+
+    - stage: test
+      name: "Linux"
+      os: linux
+      jdk: openjdk8
+    - name: "Macos"
+      os: osx
+
+    - stage: deploy
+      name: "Deploy to Jetbrains marketplace"
+      os: linux
+      jdk: openjdk8
+      env:
+        - DEPLOY_CHANNEL=stable
+        - PLUGIN_ID=11956
+      script:
+        - version=$(sed -e '/^pluginVersion = */!d; s///;q' gradle.properties) || travis_terminate 1;
+        - if [ "$version" != "$TRAVIS_TAG" ]; then echo "Version mismatch!"; travis_terminate 1; fi
+        # Build and upload
+        - ./gradlew clean build
+        - "curl -i --header \"Authorization: Bearer $DEPLOY_TOKEN\" -F pluginId=$PLUGIN_ID -F file=@$(pwd)/build/distributions/Conan-$version.zip -F channel=$DEPLOY_CHANNEL https://plugins.jetbrains.com/plugin/uploadPlugin"
+        - status="$?"
+        - echo "curl returned $status"
+        # - exit "$status"  # TODO: Even if curl succeeded, I get value "1".
+
 addons:
   apt:
     sources:
       - ubuntu-toolchain-r-test
     packages:
       - gcc-7
       - g++-7
+
+before_install:
+  - if [ $TRAVIS_OS_NAME == osx ]; then
+      brew update;
+      brew install openssl readline;
+      brew outdated pyenv || brew upgrade pyenv;
+    fi
+  - pyenv install 3.6.3
+  - pyenv global 3.6.3
+  - python --version
+
 install:
+  - pip install conan
   - if [ $TRAVIS_OS_NAME = linux ]; then
       sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 60 --slave /usr/bin/g++ g++ /usr/bin/g++-7;
-      sudo pip install conan;
-    else
-      brew install conan;
-    fi
+    fi

CHANGELOG.md

@@ -0,0 +1,34 @@
+# Changelog
+
+These are the changes to each version that has been released
+on the official [Jetbrains marketplace](https://plugins.jetbrains.com/plugin/11956-conan).
+
+
+## 1.1.2
+
+**2019-08-20**
+
+- Add Conan logo as plugin icon ([#43](https://github.com/conan-io/conan-clion-plugin/pull/43))
+- Improve CI. Deploy new releases from tags using Travis ([#41](https://github.com/conan-io/conan-clion-plugin/pull/41))
+- Differentiate unsupported project messages ([#21](https://github.com/conan-io/conan-clion-plugin/pull/21))
+
+
+## 1.1.1
+
+**2019-05-12**
+
+- Allowed to configure the Conan executable path
+- Fixed exceptions raised and other unexpected behaviors when no conan executable is found
+- Added confirmation dialog before wiping the local cache
+
+## 1.1.0
+
+**2019-05-12**
+
+- Initial release of the plugin.
+
+## 1.0.0
+
+**2019-02-10**
+
+- Initial version

gradle.properties

@@ -1,2 +1,2 @@
-pluginVersion = 1.1.1
+pluginVersion = 1.1.2
 clionVersion = 2018.1.2