Merge pull request #428 from thornbill/release-0.11.3

Release 0.11.3
jellyfin · Apr 13, 2020 · f7dafcb · f7dafcb
2 parents d33e6da + 6c75a1e
commit f7dafcb
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/.ci/azure-pipelines.yml b/.ci/azure-pipelines.yml
@@ -1,6 +1,16 @@
 trigger:
-- master
-- release
+  branches:
+    include:
+    - master
+    - release*
+  tags:
+    include:
+    - '*'
+
+pr:
+  branches:
+    include:
+    - '*'
 
 pool:
   vmImage: 'ubuntu-latest'

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -13,8 +13,8 @@ android {
 		targetSdkVersion(29)
 
 		// Release version
-		versionCode = 907
-		versionName = "0.11.2"
+		versionCode = 908
+		versionName = "0.11.3"
 	}
 
 	compileOptions {
@@ -66,6 +66,12 @@ dependencies {
 	implementation("com.github.bumptech.glide:glide:3.7.0")
 	implementation("com.flaviofaria:kenburnsview:1.0.6")
 
+	// HTTP utility
+	// NOTE: This is used by Picasso through reflection and can cause weird caching issues if removed!
+	val okhttpVersion = "2.7.5"
+	implementation("com.squareup.okhttp:okhttp:$okhttpVersion")
+	implementation("com.squareup.okhttp:okhttp-urlconnection:$okhttpVersion")
+
 	// Crash Reporting
 	val acraVersion = "5.4.0"
 	implementation("ch.acra:acra-http:$acraVersion")