Merge pull request #457 from vimeo/update-dependencies

Update dependencies
vimeo · Jan 26, 2021 · 2057980 · 2057980
2 parents 2512e41 + c3bd9ee
commit 2057980
Show file tree

Hide file tree

Showing 29 changed files with 826 additions and 96 deletions.
diff --git a/api-core/build.gradle b/api-core/build.gradle
@@ -9,9 +9,6 @@ repositories {
 dependencies {
     compileOnly project(':models')
 
-    // Kotlin
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-
     // Retrofit
     api "com.squareup.retrofit2:retrofit:$retrofitVersion"
     implementation "com.squareup.retrofit2:converter-moshi:$retrofitVersion"

diff --git a/api-core/detekt_baseline.xml b/api-core/detekt_baseline.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" ?>
+<SmellBaseline>
+  <ManuallySuppressedIssues></ManuallySuppressedIssues>
+  <CurrentIssues></CurrentIssues>
+</SmellBaseline>
diff --git a/api-core/src/main/java/com/vimeo/networking2/internal/ErrorHandlingCallAdapterFactory.kt b/api-core/src/main/java/com/vimeo/networking2/internal/ErrorHandlingCallAdapterFactory.kt
@@ -45,8 +45,8 @@ internal class ErrorHandlingCallAdapterFactory(private val vimeoLogger: VimeoLog
             return null
         }
 
-        if (returnType !is ParameterizedType) {
-            throw IllegalStateException("VimeoCall must have generic type (e.g., VimeoCall<ResponseBody>)")
+        check(returnType is ParameterizedType) {
+            "VimeoCall must have generic type (e.g., VimeoCall<ResponseBody>)"
         }
         val responseType = getParameterUpperBound(0, returnType)
         val callbackExecutor = retrofit.callbackExecutor()

diff --git a/api-core/src/main/java/com/vimeo/networking2/internal/VimeoCall.kt b/api-core/src/main/java/com/vimeo/networking2/internal/VimeoCall.kt
@@ -30,6 +30,11 @@ import com.vimeo.networking2.VimeoRequest
  */
 interface VimeoCall<T> {
 
+    /**
+     * The URL to which this call will be made.
+     */
+    val url: String
+
     /**
      * Register a [VimeoCallback] for the API request.
      *
@@ -50,11 +55,6 @@ interface VimeoCall<T> {
      */
     fun cancel()
 
-    /**
-     * The URL to which this call will be made.
-     */
-    val url: String
-
     /**
      * Clone the API call.
      */

diff --git a/api-core/src/main/java/com/vimeo/networking2/internal/params/ApiParameter.kt b/api-core/src/main/java/com/vimeo/networking2/internal/params/ApiParameter.kt
@@ -36,6 +36,7 @@ import com.vimeo.networking2.internal.LocalVimeoCallAdapter
  * @param developerMessage The optional message to provide if the parameter is invalid. A default message will be added
  * by [validateParameters] when the [parameterValue] is invalid if none is provided here.
  */
+@Suppress("DataClassShouldBeImmutable")
 data class ApiParameter(
     val parameterName: String,
     val parameterValue: String?,

diff --git a/...core/src/main/java/com/vimeo/networking2/internal/params/StringValueJsonAdapterFactory.kt b/...core/src/main/java/com/vimeo/networking2/internal/params/StringValueJsonAdapterFactory.kt
@@ -32,8 +32,9 @@ import java.lang.reflect.Type
  */
 class StringValueJsonAdapterFactory : JsonAdapter.Factory {
     override fun create(type: Type, annotations: MutableSet<out Annotation>, moshi: Moshi): JsonAdapter<*>? =
-        when {
-            type is Class<*> && StringValue::class.java.isAssignableFrom(type) -> StringValueJsonAdapter()
-            else -> null
+        if (type is Class<*> && StringValue::class.java.isAssignableFrom(type)) {
+            StringValueJsonAdapter()
+        } else {
+            null
         }
 }
diff --git a/auth/build.gradle b/auth/build.gradle
@@ -9,10 +9,6 @@ repositories {
 dependencies {
     api project(':api-core')
     compileOnly project(':models')
-
-    // Kotlin
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-
 }
 
 compileKotlin {

diff --git a/auth/detekt_baseline.xml b/auth/detekt_baseline.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" ?>
+<SmellBaseline>
+  <ManuallySuppressedIssues></ManuallySuppressedIssues>
+  <CurrentIssues></CurrentIssues>
+</SmellBaseline>
diff --git a/auth/src/main/java/com/vimeo/networking2/internal/MutableAuthenticatorDelegate.kt b/auth/src/main/java/com/vimeo/networking2/internal/MutableAuthenticatorDelegate.kt
@@ -38,9 +38,7 @@ import com.vimeo.networking2.VimeoRequest
  */
 class MutableAuthenticatorDelegate(var actual: Authenticator? = null) : Authenticator {
     private val authenticator: Authenticator
-        get() = actual ?: throw IllegalStateException(
-            "Must call Authenticator.initialize() before calling Authenticator.instance()"
-        )
+        get() = actual ?: error("Must call Authenticator.initialize() before calling Authenticator.instance()")
 
     override val currentAccount: VimeoAccount?
         get() = authenticator.currentAccount

diff --git a/build.gradle b/build.gradle
@@ -1,31 +1,32 @@
 buildscript {
-    ext.kotlin_version = '1.3.72'
+    ext.kotlin_version = '1.4.21'
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.3'
-        classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4"
+        classpath 'com.android.tools.build:gradle:4.1.2'
+        classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
 
 plugins {
-    id "io.gitlab.arturbosch.detekt" version "1.0.0-RC14"
+    id "io.gitlab.arturbosch.detekt" version "1.14.2"
+    id "com.github.ben-manes.versions" version "0.36.0"
 }
 
 ext {
-    kotlin_version = '1.3.72'
     retrofitVersion = '2.9.0'
-    okioVersion =  '2.7.0'
-    moshiVersion = '1.9.3'
+    okioVersion =  '2.10.0'
+    moshiVersion = '1.11.0'
     stagVersion = '2.6.0'
-    junitVersion = '4.13'
+    junitVersion = '4.13.1'
+    buildToolsVersion = '29.0.3'
 }
 
 subprojects {
-    if (path.contains("integrations") || path.contains("models-")) {
+    if (path.contains("integrations") || path.contains("models-") || path.contains("example")) {
         return 
     }
 
@@ -47,6 +48,10 @@ allprojects {
     tasks.withType(JavaCompile) { options.fork = true }
 }
 
+tasks.named('wrapper') {
+    distributionType = Wrapper.DistributionType.ALL
+}
+
 task clean(type: Delete) {
     delete rootProject.buildDir
 }
diff --git a/detekt.yml b/detekt.yml
@@ -23,11 +23,16 @@ complexity:
   TooManyFunctions:
     active: false
   LongParameterList:
-    threshold: 6
+    functionThreshold: 6
+    constructorThreshold: 8
     ignoreDefaultParameters: true
   NestedBlockDepth:
     threshold: 5
 
+empty-blocks:
+  EmptyFunctionBlock:
+    ignoreOverridden: true
+
 exceptions:
   TooGenericExceptionCaught:
     exceptionNames:
@@ -60,12 +65,8 @@ style:
     active: false
   ExpressionBodySyntax:
     active: false
-  MatchingDeclarationName:
-    active: false
   ReturnCount:
     active: false
-  FunctionMaxLength:
-    active: false
   WildcardImport:
     active: false
   UnnecessaryParentheses:

diff --git a/detekt_configuration.gradle b/detekt_configuration.gradle
@@ -1,8 +1,8 @@
 detekt {
-    toolVersion = "1.0.0-RC14"
+    toolVersion = "1.14.2"
     input = files("$projectDir/src/main/java")
     config = files("$rootDir/detekt.yml")
-    filters = ".*test.*,.*/resources/.*,.*/tmp/.*"
+    baseline = file("$projectDir/detekt_baseline.xml")
     failFast = true
     parallel = true
 }
diff --git a/example/build.gradle b/example/build.gradle
@@ -3,20 +3,20 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 30
+    buildToolsVersion buildToolsVersion
 
     defaultConfig {
-        applicationId "com.vimeo.moshiexampleandroid"
+        applicationId "com.vimeo.example"
         minSdkVersion 21
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode 1
         versionName "1.0"
     }
 
     buildTypes {
-        release {
+        debug {
             minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
     compileOptions {
@@ -26,13 +26,10 @@ android {
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(':auth')
     implementation project(':request')
     implementation project(':models')
 
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation "androidx.appcompat:appcompat:1.1.0"
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-
+    implementation "androidx.appcompat:appcompat:1.2.0"
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Fri Jan 22 12:27:31 EST 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-all.zip
diff --git a/model-generator/detekt_baseline.xml b/model-generator/detekt_baseline.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" ?>
+<SmellBaseline>
+    <ManuallySuppressedIssues></ManuallySuppressedIssues>
+    <CurrentIssues></CurrentIssues>
+</SmellBaseline>
diff --git a/model-generator/integrations/models-input/build.gradle b/model-generator/integrations/models-input/build.gradle
@@ -4,11 +4,9 @@ apply plugin: 'kotlin-kapt'
 
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation "com.squareup.moshi:moshi-kotlin:1.9.3"
-    kapt "com.squareup.moshi:moshi-kotlin-codegen:1.9.3"
+    implementation "com.squareup.moshi:moshi-kotlin:$moshiVersion"
+    kapt "com.squareup.moshi:moshi-kotlin-codegen:$moshiVersion"
 }
 
 sourceCompatibility = "1.8"
-targetCompatibility = "1.8"
+targetCompatibility = "1.8"
diff --git a/model-generator/integrations/models-output/build.gradle b/model-generator/integrations/models-output/build.gradle
@@ -13,17 +13,15 @@ generated {
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation "com.squareup.moshi:moshi-kotlin:1.9.3"
-    kapt "com.squareup.moshi:moshi-kotlin-codegen:1.9.3"
+    implementation "com.squareup.moshi:moshi-kotlin:$moshiVersion"
+    kapt "com.squareup.moshi:moshi-kotlin-codegen:$moshiVersion"
 
-    testImplementation "junit:junit:4.13"
+    testImplementation "junit:junit:4.13.1"
     testImplementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
-    testImplementation "org.assertj:assertj-core:3.16.1"
+    testImplementation "org.assertj:assertj-core:3.18.1"
     testImplementation "io.github.classgraph:classgraph:4.8.87"
-    testImplementation "uk.co.jemos.podam:podam:7.2.3.RELEASE"
+    testImplementation "uk.co.jemos.podam:podam:7.2.5.RELEASE"
 }
 
 sourceCompatibility = "1.8"
-targetCompatibility = "1.8"
+targetCompatibility = "1.8"
diff --git a/model-generator/plugin/build.gradle b/model-generator/plugin/build.gradle
@@ -1,6 +1,6 @@
 plugins {
-    id 'org.jetbrains.kotlin.jvm' version '1.3.72'
-    id 'io.gitlab.arturbosch.detekt' version '1.0.0-RC14'
+    id 'org.jetbrains.kotlin.jvm' version '1.4.10'
+    id 'io.gitlab.arturbosch.detekt' version '1.14.2'
     id 'java-gradle-plugin'
 }
 
@@ -10,14 +10,13 @@ repositories {
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.3.72'
-    implementation 'org.jetbrains.kotlin:kotlin-compiler-embeddable:1.3.72'
-    implementation 'org.jetbrains.kotlin:kotlin-android-extensions:1.3.72'
-    implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.3.72'
+    implementation 'org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.4.21'
+    implementation 'org.jetbrains.kotlin:kotlin-compiler-embeddable:1.4.21'
+    implementation 'org.jetbrains.kotlin:kotlin-android-extensions:1.4.21'
+    implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.4.21'
 
     implementation 'com.squareup:kotlinpoet:1.6.0'
-    implementation 'com.squareup.moshi:moshi-kotlin:1.9.3'
+    implementation "com.squareup.moshi:moshi-kotlin:1.11.0"
 }
 
 sourceCompatibility = '1.8'
@@ -30,4 +29,4 @@ gradlePlugin {
             implementationClass = 'com.vimeo.modelgenerator.GenerateModelsPlugin'
         }
     }
-}
+}
diff --git a/model-generator/plugin/detekt_baseline.xml b/model-generator/plugin/detekt_baseline.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" ?>
+<SmellBaseline>
+    <ManuallySuppressedIssues></ManuallySuppressedIssues>
+    <CurrentIssues></CurrentIssues>
+</SmellBaseline>
diff --git a/models-parcelable/build.gradle b/models-parcelable/build.gradle
@@ -16,10 +16,12 @@ generated {
 }
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 30
+    buildToolsVersion buildToolsVersion
+
     defaultConfig {
         minSdkVersion 23
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -49,14 +51,12 @@ android {
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation "com.squareup.moshi:moshi-kotlin:1.9.3"
-    kapt "com.squareup.moshi:moshi-kotlin-codegen:1.9.3"
+    implementation "com.squareup.moshi:moshi-kotlin:$moshiVersion"
+    kapt "com.squareup.moshi:moshi-kotlin-codegen:$moshiVersion"
 
-    testImplementation "junit:junit:4.13"
-    testImplementation "org.assertj:assertj-core:3.16.1"
+    testImplementation "junit:junit:4.13.1"
+    testImplementation "org.assertj:assertj-core:3.18.1"
     testImplementation "io.github.classgraph:classgraph:4.8.87"
-    testImplementation "uk.co.jemos.podam:podam:7.2.3.RELEASE"
+    testImplementation "uk.co.jemos.podam:podam:7.2.5.RELEASE"
     testImplementation 'org.robolectric:robolectric:4.3.1'
 }
diff --git a/models-serializable/build.gradle b/models-serializable/build.gradle
@@ -18,15 +18,14 @@ generated {
 }
 
 dependencies {
-    implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.3.72'
-    implementation 'com.squareup.moshi:moshi-kotlin:1.9.3'
-    kapt 'com.squareup.moshi:moshi-kotlin-codegen:1.9.3'
+    implementation "com.squareup.moshi:moshi-kotlin:$moshiVersion"
+    kapt "com.squareup.moshi:moshi-kotlin-codegen:$moshiVersion"
 
-    testImplementation 'junit:junit:4.13'
-    testImplementation 'org.assertj:assertj-core:3.16.1'
+    testImplementation 'junit:junit:4.13.1'
+    testImplementation 'org.assertj:assertj-core:3.18.1'
     testImplementation 'io.github.classgraph:classgraph:4.8.87'
-    testImplementation 'uk.co.jemos.podam:podam:7.2.3.RELEASE'
+    testImplementation 'uk.co.jemos.podam:podam:7.2.5.RELEASE'
 }
 
 sourceCompatibility = '1.8'
-targetCompatibility = '1.8'
+targetCompatibility = '1.8'