thedevstack/PiratX-NoCleanFork
2
0
Fork 0
forked from mirror/monocles_chat
Code Issues 5 Pull requests Wiki Activity

update Gradle (Christian Schneppe)

Browse source
This commit is contained in:
12aw 2022-05-23 19:17:59 +02:00
parent 1b3b3a31f9
commit 0703694dfe
5 changed files with 17 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
build.gradle
View file

@ -6,7 +6,7 @@ buildscript {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:7.1.3' classpath 'com.android.tools.build:gradle:7.2.0'
} }
} }
@ -97,7 +97,7 @@ ext {
} }
android { android {
namespace 'eu.siacs.conversations'
//noinspection GradleCompatible //noinspection GradleCompatible
compileSdkVersion 31 compileSdkVersion 31
@ -128,12 +128,12 @@ android {
} }
packagingOptions { packagingOptions {
//X86 jniLibs {
exclude "lib/x86/**" excludes += ['lib/x86/**', 'lib/x86_64/**']
//X86_64 }
exclude "lib/x86_64/**" resources {
//armeabi excludes += ['lib/x86/**', 'lib/x86_64/**', 'META-INF/BCKEY.DSA', 'META-INF/BCKEY.SF']
//exclude "lib/armeabi/**" }
} }
compileOptions { compileOptions {
@ -190,13 +190,6 @@ android {
} }
} }
lintOptions {
error 'StringFormatInvalid' , 'StringFormatMatches'
disable 'ExtraTranslation', 'MissingTranslation', 'InvalidPackage', 'MissingQuantity', 'AppCompatResource', 'RestrictedApi'
checkReleaseBuilds true
abortOnError false
}
subprojects { subprojects {
afterEvaluate { afterEvaluate {
@ -211,8 +204,10 @@ android {
} }
} }
packagingOptions { lint {
exclude 'META-INF/BCKEY.DSA' abortOnError false
exclude 'META-INF/BCKEY.SF' checkReleaseBuilds true
disable 'ExtraTranslation', 'MissingTranslation', 'InvalidPackage', 'MissingQuantity', 'AppCompatResource', 'RestrictedApi'
error 'StringFormatInvalid', 'StringFormatMatches'
} }
} }

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

@ -1,6 +1,6 @@
#Wed Feb 16 16:19:55 CET 2022 #Wed Feb 16 16:19:55 CET 2022
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME

3
src/git/AndroidManifest.xml
View file

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android">
package="eu.siacs.conversations">
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />

3
src/main/AndroidManifest.xml
View file

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools">
package="eu.siacs.conversations">
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_CONTACTS" /> <uses-permission android:name="android.permission.READ_CONTACTS" />

3
src/playstore/AndroidManifest.xml
View file

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools">
package="eu.siacs.conversations">
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
tools:ignore="ScopedStorage" /> tools:ignore="ScopedStorage" />