jellyfin/jellyfin-sdk-kotlin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-sdk-kotlin.git synced 2024-11-23 22:09:53 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Merge pull request #147 from nielsvanvelzen/deps-update-202011

Browse Source 
Update all dependencies (November edition)
This commit is contained in:
Max Rumpf 2020-11-15 19:24:09 +01:00 committed by GitHub
commit 58571417bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 31 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle.kts
View File

@ -1,6 +1,6 @@
plugins {
id("maven-publish")
id("io.gitlab.arturbosch.detekt").version("1.9.1")
id("io.gitlab.arturbosch.detekt").version(Dependencies.detektVersion)
}
// Versioning

17
buildSrc/src/main/kotlin/Dependencies.kt
View File

@ -19,24 +19,24 @@ object Dependencies {
object KotlinX {
private fun item(module: String, version: String) = "org.jetbrains.kotlinx:kotlinx-${module}:${version}"
val coroutinesCore = item("coroutines-core", "1.4.0")
val serializationJson = item("serialization-json", "1.0.0")
val coroutinesCore = item("coroutines-core", "1.4.1")
val serializationJson = item("serialization-json", "1.0.1")
}
object Android {
const val buildTools = "com.android.tools.build:gradle:4.0.1"
const val desugarJdkLibs = "com.android.tools:desugar_jdk_libs:1.0.10"
const val buildTools = "com.android.tools.build:gradle:4.1.1"
const val desugarJdkLibs = "com.android.tools:desugar_jdk_libs:1.1.0"
}
object AndroidX {
private fun item(library: String, module: String = library, version: String) = "androidx.${library}:${module}:${version}"
val core = item("core", "core-ktx", "1.3.0")
val core = item("core", "core-ktx", "1.3.2")
val annotation = item("annotation", version = "1.1.0")
}
object Ktor {
private const val version = "1.4.0"
private const val version = "1.4.2"
private fun item(library: String) = "io.ktor:ktor-$library:$version"
val okhttp = item("client-okhttp")
@ -47,7 +47,7 @@ object Dependencies {
}
object Koin {
private const val version = "2.1.6"
private const val version = "2.2.0"
private fun item(module: String) = "org.koin:koin-$module:$version"
val core = item("core")
@ -62,10 +62,11 @@ object Dependencies {
}
// Non-categorised dependencies
const val swaggerParser = "io.swagger.parser.v3:swagger-parser:2.0.19"
const val swaggerParser = "io.swagger.parser.v3:swagger-parser:2.0.23"
const val kotlinPoet = "com.squareup:kotlinpoet:1.7.2"
const val kasechange = "net.pearx.kasechange:kasechange:1.3.0"
const val clikt = "com.github.ajalt.clikt:clikt:3.0.1"
const val detektVersion = "1.14.2"
}
/**

BIN
gradle/wrapper/gradle-wrapper.jar vendored
View File

Binary file not shown.

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

35
gradlew vendored
View File

@ -7,7 +7,7 @@
# 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
# https://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,
@ -125,8 +125,8 @@ if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi
# For Cygwin, switch paths to Windows format before running java
if $cygwin ; then
# For Cygwin or MSYS, switch paths to Windows format before running java
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"`
@ -154,19 +154,19 @@ if $cygwin ; then
else
eval `echo args$i`="\"$arg\""
fi
i=$((i+1))
i=`expr $i + 1`
done
case $i in
(0) set -- ;;
(1) set -- "$args0" ;;
(2) set -- "$args0" "$args1" ;;
(3) set -- "$args0" "$args1" "$args2" ;;
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
0) set -- ;;
1) set -- "$args0" ;;
2) set -- "$args0" "$args1" ;;
3) set -- "$args0" "$args1" "$args2" ;;
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
esac
fi
@ -175,14 +175,9 @@ save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
APP_ARGS=$(save "$@")
APP_ARGS=`save "$@"`
# Collect all arguments for the java command, following the shell quoting and substitution rules
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
cd "$(dirname "$0")"
fi
exec "$JAVACMD" "$@"

5
gradlew.bat vendored
View File

@ -5,7 +5,7 @@
@rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at
@rem
@rem http://www.apache.org/licenses/LICENSE-2.0
@rem https://www.apache.org/licenses/LICENSE-2.0
@rem
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"

2
jellyfin-platform-android/build.gradle.kts
View File

@ -20,7 +20,7 @@ android {
}
compileOptions {
coreLibraryDesugaringEnabled = true
isCoreLibraryDesugaringEnabled = true
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8