diff --git a/build.gradle b/build.gradle index d426d29b9..a32966dc8 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.3.1' + classpath 'com.android.tools.build:gradle:7.4.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 112a498f8..e17ced581 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Thu Jan 13 11:33:43 MSK 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/mastodon/build.gradle b/mastodon/build.gradle index 904e4f6da..727138002 100644 --- a/mastodon/build.gradle +++ b/mastodon/build.gradle @@ -49,9 +49,10 @@ android { setRoot "src/github" } } - lintOptions{ - checkReleaseBuilds false + namespace 'org.joinmastodon.android' + lint { abortOnError false + checkReleaseBuilds false } } diff --git a/mastodon/src/github/AndroidManifest.xml b/mastodon/src/github/AndroidManifest.xml index a75f12de6..5838d1c43 100644 --- a/mastodon/src/github/AndroidManifest.xml +++ b/mastodon/src/github/AndroidManifest.xml @@ -1,6 +1,5 @@ - + diff --git a/mastodon/src/main/AndroidManifest.xml b/mastodon/src/main/AndroidManifest.xml index a30bb3c80..c5ffb97e4 100644 --- a/mastodon/src/main/AndroidManifest.xml +++ b/mastodon/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - +