From a877612fca2a5034b77c33600b1c247fff2d0757 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Abel=20Garc=C3=ADa=20de=20Prada?= Date: Tue, 13 Dec 2022 14:51:57 +0100 Subject: [PATCH 1/2] Bump several dependencies at the same time --- build.gradle | 10 +++++----- owncloudComLibrary/build.gradle | 8 ++++---- .../services/implementation/OCCapabilityService.kt | 5 +---- .../services/implementation/OCServerInfoService.kt | 9 +++------ 4 files changed, 13 insertions(+), 19 deletions(-) diff --git a/build.gradle b/build.gradle index aa8824db..8e1455fa 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ buildscript { ext { - kotlinVersion = '1.6.21' - moshiVersion = "1.13.0" + orgJetbrainsKotlin = '1.7.20' + comSquareupMoshi = '1.14.0' } repositories { @@ -10,9 +10,9 @@ buildscript { maven { url "https://plugins.gradle.org/m2/" } } dependencies { - classpath "org.jlleitschuh.gradle:ktlint-gradle:10.3.0" + classpath "org.jlleitschuh.gradle:ktlint-gradle:11.0.0" classpath 'com.android.tools.build:gradle:7.1.3' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$orgJetbrainsKotlin" } } @@ -26,4 +26,4 @@ allprojects { subprojects { apply plugin: "org.jlleitschuh.gradle.ktlint" -} \ No newline at end of file +} diff --git a/owncloudComLibrary/build.gradle b/owncloudComLibrary/build.gradle index 34391930..bcba8217 100644 --- a/owncloudComLibrary/build.gradle +++ b/owncloudComLibrary/build.gradle @@ -5,16 +5,16 @@ apply plugin: 'kotlin-parcelize' dependencies { api 'com.squareup.okhttp3:okhttp:4.6.0' - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$orgJetbrainsKotlin" api 'com.gitlab.ownclouders:dav4android:oc_support_2.1.5' api 'com.github.AppDevNext.Logcat:LogcatCore:2.2.2' // Moshi - implementation("com.squareup.moshi:moshi-kotlin:$moshiVersion") { + implementation("com.squareup.moshi:moshi-kotlin:$comSquareupMoshi") { exclude module: "kotlin-reflect" } implementation 'org.apache.commons:commons-lang3:3.12.0' - kapt "com.squareup.moshi:moshi-kotlin-codegen:$moshiVersion" + kapt "com.squareup.moshi:moshi-kotlin-codegen:$comSquareupMoshi" testImplementation 'junit:junit:4.13.2' testImplementation 'org.robolectric:robolectric:4.9' @@ -22,7 +22,7 @@ dependencies { } android { - compileSdkVersion 31 + compileSdkVersion 33 defaultConfig { minSdkVersion 21 diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/services/implementation/OCCapabilityService.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/services/implementation/OCCapabilityService.kt index e211475f..01c9c628 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/services/implementation/OCCapabilityService.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/services/implementation/OCCapabilityService.kt @@ -1,8 +1,6 @@ /* ownCloud Android Library is available under MIT license * Copyright (C) 2022 ownCloud GmbH. * - * @author David González Verdugo - * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal * in the Software without restriction, including without limitation the rights @@ -32,8 +30,7 @@ import com.owncloud.android.lib.resources.status.GetRemoteCapabilitiesOperation import com.owncloud.android.lib.resources.status.RemoteCapability import com.owncloud.android.lib.resources.status.services.CapabilityService -class OCCapabilityService(override val client: OwnCloudClient) : - CapabilityService { +class OCCapabilityService(override val client: OwnCloudClient) : CapabilityService { override fun getCapabilities(): RemoteOperationResult = GetRemoteCapabilitiesOperation().execute(client) } diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/services/implementation/OCServerInfoService.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/services/implementation/OCServerInfoService.kt index d2c891f0..0997f712 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/services/implementation/OCServerInfoService.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/services/implementation/OCServerInfoService.kt @@ -1,8 +1,6 @@ /* ownCloud Android Library is available under MIT license * Copyright (C) 2022 ownCloud GmbH. * - * @author Abel García de Prada - * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal * in the Software without restriction, including without limitation the rights @@ -26,7 +24,6 @@ package com.owncloud.android.lib.resources.status.services.implementation - import com.owncloud.android.lib.common.OwnCloudClient import com.owncloud.android.lib.common.operations.RemoteOperationResult import com.owncloud.android.lib.resources.files.CheckPathExistenceRemoteOperation @@ -39,16 +36,16 @@ class OCServerInfoService : ServerInfoService { override fun checkPathExistence( path: String, isUserLoggedIn: Boolean, - client: OwnCloudClient + client: OwnCloudClient, ): RemoteOperationResult = CheckPathExistenceRemoteOperation( remotePath = path, - isUserLoggedIn = true + isUserLoggedIn = true, ).execute(client) override fun getRemoteStatus( path: String, - client: OwnCloudClient + client: OwnCloudClient, ): RemoteOperationResult = GetRemoteStatusOperation().execute(client) } From 7ceef58382e77d72a49dd18118fbc0561414a3d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Abel=20Garc=C3=ADa=20de=20Prada?= Date: Tue, 13 Dec 2022 19:00:10 +0100 Subject: [PATCH 2/2] Bump gradle plugin to 7.3.1 and move package name fro manifest to gradle namespace --- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- owncloudComLibrary/build.gradle | 1 + owncloudComLibrary/src/main/AndroidManifest.xml | 3 +-- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 8e1455fa..2baca957 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ buildscript { } dependencies { classpath "org.jlleitschuh.gradle:ktlint-gradle:11.0.0" - classpath 'com.android.tools.build:gradle:7.1.3' + classpath 'com.android.tools.build:gradle:7.3.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$orgJetbrainsKotlin" } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2e6e5897..41dfb879 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/owncloudComLibrary/build.gradle b/owncloudComLibrary/build.gradle index bcba8217..6b71177d 100644 --- a/owncloudComLibrary/build.gradle +++ b/owncloudComLibrary/build.gradle @@ -39,4 +39,5 @@ android { includeAndroidResources = true } } + namespace 'com.owncloud.android.lib' } diff --git a/owncloudComLibrary/src/main/AndroidManifest.xml b/owncloudComLibrary/src/main/AndroidManifest.xml index 4561b3f5..baef71f2 100644 --- a/owncloudComLibrary/src/main/AndroidManifest.xml +++ b/owncloudComLibrary/src/main/AndroidManifest.xml @@ -23,8 +23,7 @@ --> - +