trying to fix issue 172

konradrenner · Mar 16, 2018 · 14ba3c3 · 14ba3c3
1 parent d4d1786
commit 14ba3c3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 You can also have a look on the GitHub release page: https://github.com/konradrenner/kolabnotes-android/releases
 
+## [3.1.2] - 2018-02-22
+### Fixed
+- TLS v1.1 and v1.2 support (issue 172)
+
 ## [3.1.1] - 2018-02-22
 ### Added
 - Search in note description (issue 155)
@@ -83,7 +87,8 @@ You can also have a look on the GitHub release page: https://github.com/konradre
 ### Fixed
 - First stable release, support for all major features of the Kolab notes format
 
-[Unreleased]: https://github.com/konradrenner/kolabnotes-android/compare/3.1.1...HEAD
+[Unreleased]: https://github.com/konradrenner/kolabnotes-android/compare/3.1.2...HEAD
+[3.1.1]: https://github.com/konradrenner/kolabnotes-android/compare/3.1.1...3.1.2
 [3.0.1]: https://github.com/konradrenner/kolabnotes-android/compare/3.0.1...3.1.1
 [3.0.1]: https://github.com/konradrenner/kolabnotes-android/compare/3.0.0...3.0.1
 [3.0.0]: https://github.com/konradrenner/kolabnotes-android/compare/2.7.2...3.0.0

diff --git a/app/app.iml b/app/app.iml
@@ -122,7 +122,6 @@
     <orderEntry type="library" name="com.android.support:recyclerview-v7-26.1.0" level="project" />
     <orderEntry type="library" scope="TEST" name="junit:junit:4.12@jar" level="project" />
     <orderEntry type="library" name="android.arch.lifecycle:common:1.0.0@jar" level="project" />
-    <orderEntry type="library" name="com.github.konradrenner:kolabnotes-java:3.4.0@jar" level="project" />
     <orderEntry type="library" scope="TEST" name="com.android.support.test.espresso:espresso-core-3.0.1" level="project" />
     <orderEntry type="library" name="com.android.support:support-fragment-26.1.0" level="project" />
     <orderEntry type="library" scope="TEST" name="javax.inject:javax.inject:1@jar" level="project" />
@@ -136,6 +135,7 @@
     <orderEntry type="library" scope="TEST" name="com.android.support.test:runner-1.0.1" level="project" />
     <orderEntry type="library" scope="TEST" name="com.android.support.test:rules-1.0.1" level="project" />
     <orderEntry type="library" name="jp.wasabeef:richeditor-android-1.2.2" level="project" />
+    <orderEntry type="library" name="com.github.konradrenner:kolabnotes-java:3.4.1@jar" level="project" />
     <orderEntry type="library" scope="TEST" name="com.google.code.findbugs:jsr305:2.0.1@jar" level="project" />
     <orderEntry type="library" scope="TEST" name="com.android.support.test.espresso:espresso-idling-resource-3.0.1" level="project" />
     <orderEntry type="library" scope="TEST" name="org.hamcrest:hamcrest-core:1.3@jar" level="project" />

diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "org.kore.kolabnotes.android"
         minSdkVersion 16
         targetSdkVersion 26
-        versionCode 96
-        versionName "3.1.1"
+        versionCode 97
+        versionName "3.1.2"
 
         //Running test
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -42,6 +42,6 @@ dependencies {
     androidTestCompile 'com.android.support.test:runner:1.0.1'
     androidTestCompile 'com.android.support:support-annotations:26.1.0'
 
-    compile 'com.github.konradrenner:kolabnotes-java:3.4.0'
+    compile 'com.github.konradrenner:kolabnotes-java:3.4.1'
     compile 'jp.wasabeef:richeditor-android:1.2.2'
 }