From 81805b7faa4896e41459bc71220581bc1b6c0dc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Martin?= Date: Fri, 8 May 2020 21:29:41 +0200 Subject: [PATCH 1/5] Update to Gradle 3.6.3 and Kotlin 1.3.72 --- app/app.iml | 250 ++++++++++++----------- app/build.gradle | 21 +- build.gradle | 6 +- gradle/wrapper/gradle-wrapper.properties | 4 +- 4 files changed, 137 insertions(+), 144 deletions(-) diff --git a/app/app.iml b/app/app.iml index 66b6f00..07ce026 100644 --- a/app/app.iml +++ b/app/app.iml @@ -4,35 +4,39 @@ - - - + + + - - - + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -112,103 +164,55 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index d572b61..8a7d5aa 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -27,8 +27,8 @@ repositories { } android { - compileSdkVersion 28 - buildToolsVersion '28.0.2' + compileSdkVersion 29 + buildToolsVersion '28.0.3' packagingOptions { exclude 'META-INF/LICENSE.txt' exclude 'META-INF/NOTICE.txt' @@ -36,7 +36,7 @@ android { defaultConfig { applicationId "io.github.benoitduffez.cupsprint" minSdkVersion 19 - targetSdkVersion 28 + targetSdkVersion 29 versionCode buildVersionCode() versionName version testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -75,8 +75,8 @@ android { dependencies { implementation 'javax.jmdns:jmdns:3.4.1' - implementation 'androidx.appcompat:appcompat:1.0.0' - playstoreImplementation('com.crashlytics.sdk.android:crashlytics:2.6.5@aar') { + implementation 'androidx.appcompat:appcompat:1.1.0' + playstoreImplementation('com.crashlytics.sdk.android:crashlytics:2.10.1@aar') { transitive = true } androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0-alpha4', { @@ -99,17 +99,6 @@ task jacocoTestReport(type: JacocoReport, dependsOn: ['testDebugUnitTest', 'crea xml.enabled = true html.enabled = true } - - def fileFilter = ['**/R.class', '**/R$*.class', '**/BuildConfig.*', '**/Manifest*.*', '**/*Test*.*', 'android/**/*.*'] - def debugTree = fileTree(dir: "${buildDir}/intermediates/classes/debug", excludes: fileFilter) - def mainSrc = "${project.projectDir}/src/main/java" - - sourceDirectories = files([mainSrc]) - classDirectories = files([debugTree]) - executionData = fileTree(dir: "$buildDir", includes: [ - "jacoco/testDebugUnitTest.exec", - "outputs/code-coverage/connected/*coverage.ec" - ]) } play { diff --git a/build.gradle b/build.gradle index e6c90e5..b94406e 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.2.61' + ext.kotlin_version = '1.3.72' repositories { jcenter() maven { url 'https://maven.fabric.io/public' } @@ -12,14 +12,14 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.3.0-alpha08' + classpath 'com.android.tools.build:gradle:3.6.3' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files // The Fabric Gradle plugin uses an open ended version to react // quickly to Android tooling updates - classpath 'io.fabric.tools:gradle:1.+' + classpath 'io.fabric.tools:gradle:1.31.2' classpath 'com.github.triplet.gradle:play-publisher:1.2.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2d4de98..65477c3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Sep 06 16:51:16 CEST 2018 +#Fri May 08 20:59:40 CEST 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip From c9c996f7ba749871d438e31d22d3c98c74d7faf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Martin?= Date: Fri, 8 May 2020 23:13:39 +0200 Subject: [PATCH 2/5] Optimize imports --- app/app.iml | 32 +++++++++++++------ app/build.gradle | 5 +-- .../ethz/vppserver/ippclient/EnumItemMap.kt | 2 +- .../ch/ethz/vppserver/ippclient/EnumMap.kt | 2 +- .../ch/ethz/vppserver/ippclient/IppLists.kt | 3 +- .../ethz/vppserver/ippclient/IppResponse.kt | 13 +++----- .../ch/ethz/vppserver/ippclient/IppUtil.kt | 2 +- .../vppserver/schema/ippclient/Attribute.kt | 2 +- .../schema/ippclient/AttributeGroup.kt | 2 +- .../vppserver/schema/ippclient/SetOfEnum.kt | 2 +- .../schema/ippclient/SetOfKeyword.kt | 2 +- .../cupsprint/HttpConnectionManagement.kt | 6 +--- .../cupsprint/app/BasicAuthActivity.kt | 3 +- .../app/ManageManualPrintersActivity.kt | 2 +- .../cupsprint/detect/MdnsServices.kt | 4 +-- .../benoitduffez/cupsprint/detect/Merger.kt | 2 +- .../cupsprint/detect/PrinterResult.kt | 3 +- .../CupsPrinterDiscoverySession.kt | 16 +++------- .../printservice/CupsPrinterDiscoveryUtils.kt | 8 ++--- .../cupsprint/printservice/CupsService.kt | 9 ++---- .../cupsprint/ssl/AdditionalKeyManager.kt | 3 +- .../AdditionalKeyStoresSSLSocketFactory.kt | 7 +--- .../ssl/AdditionalKeyStoresTrustManager.kt | 3 +- .../ssl/AndroidCupsHostnameVerifier.kt | 3 +- app/src/main/java/org/cups4j/CupsClient.kt | 8 ++--- app/src/main/java/org/cups4j/CupsPrinter.kt | 2 +- .../java/org/cups4j/PrintJobAttributes.kt | 2 +- .../org/cups4j/operations/IppOperation.kt | 10 ++---- .../cups/CupsGetDefaultOperation.kt | 3 +- .../operations/cups/CupsGetPPDOperation.kt | 2 +- .../cups/CupsGetPrintersOperation.kt | 3 +- .../operations/cups/CupsMoveJobOperation.kt | 4 +-- .../operations/ipp/IppCancelJobOperation.kt | 8 ++--- .../ipp/IppGetJobAttributesOperation.kt | 5 ++- .../operations/ipp/IppGetJobsOperation.kt | 12 ++----- .../operations/ipp/IppHoldJobOperation.kt | 2 +- .../operations/ipp/IppReleaseJobOperation.kt | 2 +- 37 files changed, 79 insertions(+), 120 deletions(-) diff --git a/app/app.iml b/app/app.iml index 07ce026..4d56a1d 100644 --- a/app/app.iml +++ b/app/app.iml @@ -31,7 +31,7 @@