Release 2025-05-23

.git-pr-release

@@ -1,4 +1,10 @@
 Release <%= Time.now.strftime('%Y-%m-%d') %>
-<% pull_requests.each do |pr| -%>
+
+<% pull_requests.reject {|item| item.pr.user ? item.pr.user.login =~ /\A(renovate|dependabot)/ : false }.each do |pr| -%>
+<%=  "- ##{pr.pr.number}" + pr.mention %>
+<% end -%>
+
+## Dependency updates
+<% pull_requests.select {|item| item.pr.user ? item.pr.user.login =~ /\A(renovate|dependabot)/ : false }.each do |pr| -%>
 <%=  "- ##{pr.pr.number}" + pr.mention %>
 <% end -%>

.github/workflows/baseline-profiles.yml

@@ -6,15 +6,15 @@ jobs:
   generate-baseline-profiles:
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup Android SDK
-        uses: android-actions/setup-android@v2
+        uses: android-actions/setup-android@v3
 
       - name: Setup JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
-          java-version: 11
+          java-version: 17
           distribution: zulu
           cache: gradle
 
@@ -25,7 +25,7 @@ jobs:
           mv benchmark/build/outputs/managed_device_android_test_additional_output/pixel2Api31/BaselineProfileGenerator_startup-baseline-prof.txt app/src/main/baseline-prof.txt
 
       - name: Create pull request
-        uses: peter-evans/create-pull-request@v5
+        uses: peter-evans/create-pull-request@v7
         with:
           commit-message: Updated baseline profiles
           title: Updated baseline profiles

.github/workflows/build.yml

@@ -9,13 +9,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
+      - uses: actions/checkout@v4
       - name: set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
-          java-version: 11
+          java-version: 17
           distribution: zulu
           cache: gradle
       - name: Build with Gradle

.github/workflows/danger.yml

@@ -8,13 +8,11 @@ jobs:
     if: github.head_ref != 'develop'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
+      - uses: actions/checkout@v4
       - name: set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
-          java-version: 11
+          java-version: 17
           distribution: zulu
           cache: gradle
       - name: Setup Ruby

.github/workflows/git-pr-release.yml

@@ -7,7 +7,7 @@ jobs:
   create-release-pr:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - uses: ruby/setup-ruby@v1

.gitignore

@@ -9,4 +9,5 @@
 .externalNativeBuild
 *.apk
 output.json
-*.aab
+*.aab
+.kotlin/

Gemfile.lock

@@ -55,14 +55,16 @@ GEM
     open4 (1.3.4)
     public_suffix (5.0.1)
     rchardet (1.8.0)
-    rexml (3.2.5)
+    rexml (3.2.8)
+      strscan (>= 3.0.9)
     ruby-ll (2.1.2)
       ansi
       ast
     ruby2_keywords (0.0.5)
     sawyer (0.9.2)
       addressable (>= 2.3.5)
       faraday (>= 0.17.3, < 3)
+    strscan (3.1.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
     unicode-display_width (2.4.2)

app/build.gradle

@@ -3,7 +3,8 @@ plugins {
     id 'kotlin-android'
     id 'com.google.android.gms.oss-licenses-plugin'
     id 'dagger.hilt.android.plugin'
-    id 'kotlin-kapt'
+    alias libs.plugins.kspPlugin
+    alias libs.plugins.baselineProfilePlugin
 }
 
 android {
@@ -32,17 +33,11 @@ android {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
-        benchmark {
-            initWith buildTypes.release
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro', 'proguard-benchmark.pro'
-            signingConfig signingConfigs.debug
-            matchingFallbacks = ['release']
-            debuggable false
-        }
     }
 
     buildFeatures {
         viewBinding = true
+        buildConfig = true
     }
 
     compileOptions {
@@ -51,10 +46,6 @@ android {
     }
 }
 
-kapt {
-    correctErrorTypes true
-}
-
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
@@ -87,7 +78,7 @@ dependencies {
     implementation libs.insetter
 
     implementation libs.dagger.hilt.android
-    kapt libs.dagger.hilt.android.compiler
+    ksp libs.dagger.hilt.android.compiler
 
     implementation libs.licenses
 
@@ -97,6 +88,8 @@ dependencies {
     implementation libs.androidx.profileinstaller
 
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test:runner:1.5.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+    androidTestImplementation 'androidx.test:runner:1.6.2'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
+
+    "baselineProfile"(projects.benchmark)
 }

app/src/main/java/com/numero/material_gallery/MainActivity.kt

@@ -6,6 +6,7 @@ import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.core.view.*
+import androidx.fragment.app.FragmentManager
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.NavHostFragment
 import androidx.navigation.fragment.findNavController
@@ -78,6 +79,8 @@ class MainActivity : AppCompatActivity() {
         setContentView(binding.root)
         setSupportActionBar(binding.toolbar)
 
+        FragmentManager.enablePredictiveBack(BuildConfig.DEBUG)
+
         WindowCompat.setDecorFitsSystemWindows(window, false)
         window.statusBarColor = Color.TRANSPARENT
         binding.appbar.applyInsetter {

benchmark/build.gradle

@@ -1,6 +1,7 @@
 plugins {
     id 'com.android.test'
     id 'org.jetbrains.kotlin.android'
+    alias libs.plugins.baselineProfilePlugin
 }
 
 android {
@@ -9,23 +10,12 @@ android {
     compileSdkVersion versions.compileSdk
 
     defaultConfig {
-        minSdk versions.minSdk
+        minSdk 28
         targetSdk versions.targetSdk
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
-    buildTypes {
-        // This benchmark buildType is used for benchmarking, and should function like your
-        // release build (for example, with minification on). It's signed with a debug key
-        // for easy local/CI testing.
-        benchmark {
-            debuggable = true
-            signingConfig = debug.signingConfig
-            matchingFallbacks = ["release"]
-        }
-    }
-
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_11
         targetCompatibility = JavaVersion.VERSION_11
@@ -47,16 +37,15 @@ android {
     }
 }
 
-dependencies {
-    implementation 'androidx.test.ext:junit:1.1.5'
-    implementation 'androidx.test.espresso:espresso-core:3.5.1'
-    implementation 'androidx.test.uiautomator:uiautomator:2.2.0'
-    implementation 'androidx.benchmark:benchmark-macro-junit4:1.1.1'
-    implementation libs.androidx.profileinstaller
+baselineProfile {
+    managedDevices += "pixel2Api31"
+    useConnectedDevices = false
 }
 
-androidComponents {
-    beforeVariants(selector().all()) {
-        enabled = buildType == "benchmark"
-    }
+dependencies {
+    implementation 'androidx.test.ext:junit:1.2.1'
+    implementation 'androidx.test.espresso:espresso-core:3.6.1'
+    implementation 'androidx.test.uiautomator:uiautomator:2.3.0'
+    implementation libs.androidx.benchmark
+    implementation libs.androidx.profileinstaller
 }

benchmark/src/main/java/com/numero/material_gallery/benchmark/BaselineProfileGenerator.kt

@@ -1,25 +1,22 @@
 package com.numero.material_gallery.benchmark
 
-import androidx.benchmark.macro.ExperimentalBaselineProfilesApi
 import androidx.benchmark.macro.junit4.BaselineProfileRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
-@ExperimentalBaselineProfilesApi
 @RunWith(AndroidJUnit4::class)
 class BaselineProfileGenerator {
     @get:Rule
     val baselineProfileRule = BaselineProfileRule()
 
     @Test
-    fun startup() =
-        baselineProfileRule.collectBaselineProfile(
-            packageName = "com.numero.material_gallery"
-        ) {
-            pressHome()
+    fun startup() = baselineProfileRule.collect(
+        packageName = "com.numero.material_gallery"
+    ) {
+        pressHome()
 
-            startActivityAndWait()
-        }
+        startActivityAndWait()
+    }
 }

build.gradle

@@ -1,9 +1,9 @@
 buildscript {
     ext {
         versions = [
-                compileSdk: 33,
+                compileSdk: 35,
                 minSdk    : 23,
-                targetSdk : 33,
+                targetSdk : 34,
         ]
     }
 
@@ -16,6 +16,8 @@ plugins {
     alias(libs.plugins.androidGradlePlugin) apply false
     alias(libs.plugins.kotlinPlugin) apply false
     alias(libs.plugins.hiltPlugin) apply false
+    alias(libs.plugins.kspPlugin) apply false
+    alias(libs.plugins.baselineProfilePlugin) apply false
 }
 
 subprojects {

core/build.gradle

@@ -2,7 +2,7 @@ plugins {
     id 'com.android.library'
     id 'kotlin-android'
     id 'dagger.hilt.android.plugin'
-    id 'kotlin-kapt'
+    alias libs.plugins.kspPlugin
 }
 
 android {
@@ -47,7 +47,7 @@ dependencies {
     implementation libs.material
 
     implementation libs.dagger.hilt.android
-    kapt libs.dagger.hilt.android.compiler
+    ksp libs.dagger.hilt.android.compiler
 
     testImplementation 'junit:junit:4.13.2'
 }

core/src/main/java/com/numero/material_gallery/core/MaterialContainerTransformFragment.kt

@@ -4,7 +4,6 @@ import android.graphics.Color
 import android.os.Bundle
 import android.view.View
 import androidx.annotation.LayoutRes
-import androidx.core.view.doOnPreDraw
 import androidx.fragment.app.Fragment
 import com.google.android.material.color.MaterialColors
 import com.google.android.material.transition.platform.Hold
@@ -33,7 +32,5 @@ abstract class MaterialContainerTransformFragment : Fragment {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         setHasOptionsMenu(true)
-        postponeEnterTransition()
-        view.doOnPreDraw { startPostponedEnterTransition() }
     }
 }

gradle.properties

@@ -17,4 +17,7 @@ org.gradle.vfs.watch=true
 
 android.enableJetifier=false
 android.enableR8.fullMode=true
-android.useAndroidX=true
+android.useAndroidX=true
+
+android.nonTransitiveRClass=false
+android.nonFinalResIds=true