Skip to content

Commit

Permalink
remove legacy configuration tasks from Gradle script so it works with…
Browse files Browse the repository at this point in the history
… Gradle 8.2 and newer
  • Loading branch information
c99koder committed Dec 14, 2023
1 parent 0c12471 commit 80560bd
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ buildscript {
maven { url "https://www.jitpack.io" }
}
dependencies {
classpath 'com.android.tools.build:gradle:8.1.4'
classpath 'com.android.tools.build:gradle:8.2.0'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.9'
classpath 'com.google.gms:google-services:4.4.0'
classpath 'com.google.firebase:perf-plugin:1.4.2'
Expand All @@ -42,7 +42,7 @@ if (rootProject.file('private.properties').exists()) {
apply plugin: 'com.google.firebase.crashlytics'
}

tasks.withType(JavaCompile) {
tasks.withType(JavaCompile).configureEach {
options.encoding = "UTF-8"
}

Expand Down Expand Up @@ -291,7 +291,7 @@ android {
}
}

task __filteredResources(type: Copy) {
tasks.register('__filteredResources', Copy) {
from('res/') {
exclude 'drawable-mdpi/ic_launcher.png'
exclude 'drawable-hdpi/ic_launcher.png'
Expand All @@ -309,7 +309,7 @@ task __filteredResources(type: Copy) {
includeEmptyDirs = true
}

tasks.whenTaskAdded { task ->
tasks.configureEach { task ->
if (task.name == 'mergeEnterprisedebugResources' || task.name == 'mergeEnterprisereleaseResources') {
task.dependsOn __filteredResources
}
Expand Down
6 changes: 3 additions & 3 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Wed Nov 16 08:01:15 EST 2022
#Thu Dec 14 08:45:59 EST 2023
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
4 changes: 2 additions & 2 deletions irccloud-android.iml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<component name="FacetManager">
<facet type="android-gradle" name="Android-Gradle">
<configuration>
<option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="8.1.4" />
<option name="LAST_KNOWN_AGP_VERSION" value="8.1.4" />
<option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="8.2.0" />
<option name="LAST_KNOWN_AGP_VERSION" value="8.2.0" />
</configuration>
</facet>
<facet type="android" name="Android">
Expand Down

0 comments on commit 80560bd

Please sign in to comment.