AtaraxiaDev/cryptomator-android
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Update Gradle to version 7.2

Browse Source
This commit is contained in:
Julian Raufelder 2022-01-26 10:32:55 +01:00
parent 1d808edd8d
commit 4221d299ce
No known key found for this signature in database
GPG Key ID: 17EE71F6634E381D
8 changed files with 47 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
.idea/misc.xml generated
View File

@ -1,5 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="DesignSurface">
<option name="filePathToZoomLevelMap">
<map>
<entry key="presentation/src/main/res/drawable/ic_lock.xml" value="0.1962962962962963" />
<entry key="presentation/src/main/res/layout/dialog_app_update.xml" value="0.36614583333333334" />
</map>
</option>
</component>
<component name="NullableNotNullManager">
<option name="myDefaultNullable" value="android.support.annotation.Nullable" />
<option name="myDefaultNotNull" value="org.jetbrains.annotations.NotNull" />
@ -26,7 +34,7 @@
</option>
<option name="myNotNulls">
<value>
<list size="14">
<list size="15">
<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
<item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
@ -41,11 +49,12 @@
<item index="11" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.NonNull" />
<item index="12" class="java.lang.String" itemvalue="io.reactivex.annotations.NonNull" />
<item index="13" class="java.lang.String" itemvalue="io.reactivex.rxjava3.annotations.NonNull" />
<item index="14" class="java.lang.String" itemvalue="lombok.NonNull" />
</list>
</value>
</option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="JDK" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">

2
build.gradle
View File

@ -8,7 +8,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.0.4'
classpath 'com.android.tools.build:gradle:7.1.0'
classpath 'org.greenrobot:greendao-gradle-plugin:3.3.0'
classpath 'com.vanniktech:gradle-android-junit-jacoco-plugin:0.16.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

2
buildsystem/dependencies.gradle
View File

@ -19,7 +19,7 @@ allprojects {
}
ext {
androidBuildToolsVersion = "30.0.2"
androidBuildToolsVersion = "30.0.3"
androidMinSdkVersion = 26
androidTargetSdkVersion = 30
androidCompileSdkVersion = 30

17
data/build.gradle
View File

@ -28,11 +28,6 @@ android {
coreLibraryDesugaringEnabled true
}
lintOptions {
quiet true
abortOnError false
ignoreWarnings true
}
buildTypes {
release {
@ -75,10 +70,16 @@ android {
java.srcDirs = ['src/main/java', 'src/main/java/', 'src/foss/java', 'src/foss/java/']
}
}
packagingOptions {
exclude 'META-INF/DEPENDENCIES'
exclude 'META-INF/NOTICE.md'
resources {
excludes += ['META-INF/DEPENDENCIES', 'META-INF/NOTICE.md']
}
}
lint {
abortOnError false
ignoreWarnings true
quiet true
}
}

6
domain/build.gradle
View File

@ -26,12 +26,12 @@ android {
coreLibraryDesugaringEnabled true
}
lintOptions {
quiet true
lint {
abortOnError false
ignoreWarnings true
quiet true
}
}
dependencies {

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-7.0.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

18
presentation/build.gradle
View File

@ -39,11 +39,6 @@ android {
coreLibraryDesugaringEnabled true
}
lintOptions {
quiet true
abortOnError false
ignoreWarnings true
}
buildTypes {
release {
@ -108,11 +103,16 @@ android {
java.srcDirs = ['src/main/java', 'src/main/java/', 'src/foss/java', 'src/foss/java/']
}
}
packagingOptions {
exclude 'META-INF/jersey-module-version'
exclude 'META-INF/NOTICE.md'
exclude 'META-INF/DEPENDENCIES'
resources {
excludes += ['META-INF/jersey-module-version', 'META-INF/NOTICE.md', 'META-INF/DEPENDENCIES']
}
}
lint {
abortOnError false
ignoreWarnings true
quiet true
}
}

19
util/build.gradle
View File

@ -24,15 +24,20 @@ android {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
lintOptions {
quiet true
abortOnError false
ignoreWarnings true
packagingOptions {
jniLibs {
pickFirsts += ['META-INF/*']
}
resources {
pickFirsts += ['META-INF/*']
}
}
packagingOptions {
pickFirst 'META-INF/*'
lint {
abortOnError false
ignoreWarnings true
quiet true
}
}