Merge pull request #129 from rubensousa/update_libraries

Update dependencies for next beta release
rubensousa · Apr 17, 2023 · 5d3bebf · 5d3bebf
2 parents 49032c9 + ad0f1b3
commit 5d3bebf
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 22 deletions.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -27,7 +27,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: 11
+          java-version: 17
 
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
@@ -58,7 +58,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: 11
+          java-version: 17
 
       - name: Gradle cache
         uses: gradle/gradle-build-action@v2

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -22,8 +22,8 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
         with:
-          distribution: temurin
-          java-version: '11'
+          distribution: 'zulu'
+          java-version: 17
 
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
@@ -54,7 +54,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: 11
+          java-version: 17
 
       - name: Gradle cache
         uses: gradle/gradle-build-action@v2

diff --git a/build.gradle b/build.gradle
@@ -8,10 +8,10 @@ buildscript {
 }
 
 plugins {
-    id 'com.android.application' version '7.4.0' apply false
-    id 'com.android.library' version '7.4.0' apply false
-    id 'org.jetbrains.kotlin.android' version '1.8.10' apply false
-    id 'org.jetbrains.kotlinx.binary-compatibility-validator' version '0.12.1'
+    id 'com.android.application' version '8.0.0' apply false
+    id 'com.android.library' version '8.0.0' apply false
+    id 'org.jetbrains.kotlin.android' version '1.8.20' apply false
+    id 'org.jetbrains.kotlinx.binary-compatibility-validator' version '0.13.0'
 }
 
 apiValidation {

diff --git a/dpadrecyclerview-compose/build.gradle b/dpadrecyclerview-compose/build.gradle
@@ -30,7 +30,6 @@ android {
     }
 
     buildFeatures {
-        buildConfig false
         compose true
     }
 

diff --git a/...w/src/test/java/com/rubensousa/dpadrecyclerview/test/layoutmanager/mock/ViewHolderMock.kt b/...w/src/test/java/com/rubensousa/dpadrecyclerview/test/layoutmanager/mock/ViewHolderMock.kt
@@ -21,8 +21,6 @@ import androidx.recyclerview.widget.RecyclerView
 import com.rubensousa.dpadrecyclerview.layoutmanager.DpadLayoutParams
 import io.mockk.every
 import io.mockk.mockk
-import java.lang.reflect.Field
-import java.lang.reflect.Modifier
 
 class ViewHolderMock(itemView: View) {
 
@@ -31,9 +29,6 @@ class ViewHolderMock(itemView: View) {
     init {
         val itemViewField = mock::class.java.getField("itemView")
         itemViewField.isAccessible = true
-        val modifiersField = Field::class.java.getDeclaredField("modifiers")
-        modifiersField.isAccessible = true
-        modifiersField.setInt(itemViewField, itemViewField.modifiers and Modifier.FINAL.inv())
         itemViewField.set(mock, itemView)
 
         every { mock.layoutPosition }.answers {

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Tue Jan 24 12:52:07 CET 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/versions.gradle b/versions.gradle
@@ -2,21 +2,21 @@ def versions = [:]
 versions.minSdkVersion = 21
 versions.targetSdkVersion = 33
 versions.compileSdkVersion = 33
-versions.recyclerview = '1.3.0-rc01'
-versions.collection = '1.3.0-alpha02'
+versions.recyclerview = '1.3.0'
+versions.collection = '1.3.0-alpha04'
 versions.constraintLayout = '2.1.4'
 versions.lifecycle = '2.5.1'
 versions.navigation = '2.5.3'
-versions.fragment = '1.6.0-alpha04'
+versions.fragment = '1.6.0-alpha09'
 versions.appcompat = '1.6.1'
 versions.poolingContainer = '1.0.0'
 versions.paging = '3.1.1'
 
 def composeVersions = [:]
-composeVersions.runtime = '1.3.3'
-composeVersions.ui = '1.3.3'
+composeVersions.runtime = '1.4.1'
+composeVersions.ui = '1.4.1'
 composeVersions.material3 = '1.0.1'
-composeVersions.compiler = '1.4.2'
+composeVersions.compiler = '1.4.5'
 
 def testVersions = [:]
 testVersions.junit = '4.13.2'
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,7 +30,6 @@ android { @@
         }
         buildFeatures {
-            buildConfig false
             compose true
         }
@@ Expand Down @@