Upgrade Gradle to 8.2 and AGP to 8.2.2

patrickgold · Feb 14, 2024 · 6e4c4f0 · 6e4c4f0
1 parent 9410e0e
commit 6e4c4f0
Show file tree

Hide file tree

Showing 10 changed files with 3 additions and 46 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 
-// Suppress needed until https://youtrack.jetbrains.com/issue/KTIJ-19369 is fixed
-@file:Suppress("DSL_SCOPE_VIOLATION")
-
 plugins {
     alias(libs.plugins.agp.application) apply false
     alias(libs.plugins.agp.library) apply false

diff --git a/datastore-annotations/build.gradle.kts b/datastore-annotations/build.gradle.kts
@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 
-// Suppress needed until https://youtrack.jetbrains.com/issue/KTIJ-19369 is fixed
-@file:Suppress("DSL_SCOPE_VIOLATION")
-
 plugins {
     alias(libs.plugins.kotlin.jvm)
     alias(libs.plugins.vanniktech.maven.publish)

diff --git a/datastore-model/build.gradle.kts b/datastore-model/build.gradle.kts
@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 
-// Suppress needed until https://youtrack.jetbrains.com/issue/KTIJ-19369 is fixed
-@file:Suppress("DSL_SCOPE_VIOLATION")
-
 plugins {
     alias(libs.plugins.agp.library)
     alias(libs.plugins.kotlin.android)

diff --git a/datastore-ui/build.gradle.kts b/datastore-ui/build.gradle.kts
@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 
-// Suppress needed until https://youtrack.jetbrains.com/issue/KTIJ-19369 is fixed
-@file:Suppress("DSL_SCOPE_VIOLATION")
-
 plugins {
     alias(libs.plugins.agp.library)
     alias(libs.plugins.kotlin.android)

diff --git a/example/build.gradle.kts b/example/build.gradle.kts
@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 
-// Suppress needed until https://youtrack.jetbrains.com/issue/KTIJ-19369 is fixed
-@file:Suppress("DSL_SCOPE_VIOLATION")
-
 plugins {
     alias(libs.plugins.agp.application)
     alias(libs.plugins.kotlin.android)

diff --git a/example/src/androidTest/java/dev/patrickgold/jetpref/ExampleInstrumentedTest.kt b/example/src/androidTest/java/dev/patrickgold/jetpref/ExampleInstrumentedTest.kt
diff --git a/gradle.properties b/gradle.properties
@@ -3,7 +3,6 @@
 org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 android.useAndroidX=true
 kotlin.code.style=official
-android.defaults.buildfeatures.buildconfig=true
 android.nonTransitiveRClass=false
 android.nonFinalResIds=false
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 # Main
-android-gradle-plugin = "8.0.0"
+android-gradle-plugin = "8.2.2"
 androidx-activity = "1.5.1"
 androidx-compose = "1.4.3"
 androidx-compose-compiler = "1.4.7"

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=29e49b10984e585d8118b7d0bc452f944e386458df27371b49b4ac1dec4b7fda
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionSha256Sum=38f66cd6eef217b4c35855bb11ea4e9fbc53594ccccb5fb82dfd317ef8c2c5a3
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/material-ui/build.gradle.kts b/material-ui/build.gradle.kts
@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 
-// Suppress needed until https://youtrack.jetbrains.com/issue/KTIJ-19369 is fixed
-@file:Suppress("DSL_SCOPE_VIOLATION")
-
 plugins {
     alias(libs.plugins.agp.library)
     alias(libs.plugins.kotlin.android)