upgrade gradle

Author: VREMSoftwareDevelopment

.github/workflows/android-emulator-test.yml

@@ -4,8 +4,6 @@ on:
     workflows: ["Android CI"]
     types:
       - completed
-    branches:
-      - main
   workflow_dispatch: {}
 
 jobs:

AGENTS.md

@@ -25,8 +25,8 @@ WiFiAnalyzer is an Android application for analyzing WiFi networks. It helps use
 ## Project Structure
 
 ```
-app/src/main/kotlin/    # Main source code
-app/src/test/kotlin/    # Unit tests
+app/src/main/kotlin/         # Main application source code
+app/src/test/kotlin/         # Unit tests
 app/src/androidTest/kotlin/  # Android instrumentation tests
 ```
 
@@ -75,30 +75,44 @@ All new features and bug fixes MUST include unit tests.
 
 ### Test File Naming
 
-Test files follow the pattern `[ClassName]Test.kt`
+Test files use several patterns, including but not limited to:
+- `[ClassName]Test.kt`
+- `[ClassName]InstrumentedTest.kt`
+- `[ClassName]IntegrationTest.kt`
+- `[ClassName]ParameterizedTest.kt`
+- `[ClassName]TestUtil.kt`
+
+Use the pattern that best describes the test's purpose. Document any deviations from these patterns in your code or pull request to maintain clarity.
 
 ### Test Structure (AAA Pattern)
 
 ```kotlin
 @Test
-fun testMethodName() {
+fun shouldReturnCorrectVersionNumber() {
     // Arrange: Set up test data and mocks
-
     // Act: Execute the code being tested
-
     // Assert: Verify the results
 }
 ```
 
 ### Testing Patterns Used
 
-**Mockito with Kotlin extensions:**
+// Example imports for test files:
 ```kotlin
 import org.mockito.kotlin.mock
 import org.mockito.kotlin.verify
 import org.mockito.kotlin.whenever
 ```
 
+// Example imports for assertions:
+```kotlin
+import org.assertj.core.api.Assertions.assertThat
+
+assertThat(actual).isEqualTo(expected)
+assertThat(actual).isTrue
+assertThat(actual).isNotNull()
+```
+
 **Test teardown pattern:**
 ```kotlin
 @After
@@ -107,13 +121,34 @@ fun tearDown() {
 }
 ```
 
-**Robolectric for Android components:**
+**Robolectric for Android components (use RobolectricUtil helper):**
 ```kotlin
-val activity = Robolectric
-    .buildActivity(MainActivity::class.java)
-    .create()
-    .resume()
-    .get()
+import com.vrem.wifianalyzer.RobolectricUtil
+
+private val mainActivity = RobolectricUtil.INSTANCE.activity
+
+// For fragments:
+RobolectricUtil.INSTANCE.startFragment(fragment)
+```
+
+## Android Instrumentation Test Conventions
+
+- Instrumentation test files are located in `app/src/androidTest/kotlin/`.
+- File names typically follow the pattern `[ClassName]InstrumentedTest.kt`.
+- Use the `@RunWith(AndroidJUnit4::class)` annotation for instrumentation tests.
+- Access UI components using Espresso or Robolectric as appropriate.
+- Example instrumentation test structure:
+
+```kotlin
+@RunWith(AndroidJUnit4::class)
+class MainActivityInstrumentedTest {
+    @Test
+    fun shouldDisplayMainScreen() {
+        // Arrange: Launch activity
+        // Act: Interact with UI
+        // Assert: Verify UI state
+    }
+}
 ```
 
 ## Build Commands

app/build.gradle

@@ -49,7 +49,7 @@ dependencies {
     testImplementation 'com.googlecode.junit-toolbox:junit-toolbox:2.4'
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.mockito:mockito-core:5.21.0'
-    testImplementation 'org.mockito.kotlin:mockito-kotlin:6.1.0'
+    testImplementation 'org.mockito.kotlin:mockito-kotlin:6.2.1'
     testImplementation 'org.robolectric:robolectric:4.16'
     testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
     testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
@@ -89,7 +89,7 @@ android {
         release {
             minifyEnabled = true
             shrinkResources = true
-            proguardFiles getDefaultProguardFile("proguard-android.txt")
+            proguardFiles getDefaultProguardFile("proguard-android-optimize.txt")
             signingConfig
         }
         debug {

app/build.properties

@@ -1,6 +1,6 @@
 #Build Properties
-#Sat Jan 10 12:10:13 EST 2026
-version_build=0
+#Sat Jan 17 10:15:29 EST 2026
+version_build=1
 version_major=3
 version_minor=2
 version_patch=2

app/src/test/kotlin/com/vrem/wifianalyzer/ActivityUtilsTest.kt

@@ -27,6 +27,7 @@ import org.assertj.core.api.Assertions.assertThat
 import org.junit.After
 import org.junit.Test
 import org.mockito.kotlin.any
+import org.mockito.kotlin.doReturn
 import org.mockito.kotlin.mock
 import org.mockito.kotlin.verify
 import org.mockito.kotlin.verifyNoMoreInteractions
@@ -54,8 +55,8 @@ class ActivityUtilsTest {
     @Test
     fun setupToolbar() {
         // setup
-        whenever<Any>(mainActivity.findViewById(R.id.toolbar)).thenReturn(toolbar)
-        whenever(mainActivity.supportActionBar).thenReturn(actionBar)
+        doReturn(toolbar).whenever(mainActivity).findViewById<View>(R.id.toolbar)
+        doReturn(actionBar).whenever(mainActivity).supportActionBar
         // execute
         val actual = mainActivity.setupToolbar()
         // validate
@@ -70,8 +71,8 @@ class ActivityUtilsTest {
     @Test
     fun keepScreenOnSwitchOn() {
         // setup
-        whenever(settings.keepScreenOn()).thenReturn(true)
-        whenever(mainActivity.window).thenReturn(window)
+        doReturn(true).whenever(settings).keepScreenOn()
+        doReturn(window).whenever(mainActivity).window
         // execute
         mainActivity.keepScreenOn()
         // validate
@@ -83,8 +84,8 @@ class ActivityUtilsTest {
     @Test
     fun keepScreenOnSwitchOff() {
         // setup
-        whenever(settings.keepScreenOn()).thenReturn(false)
-        whenever(mainActivity.window).thenReturn(window)
+        doReturn(false).whenever(settings).keepScreenOn()
+        doReturn(window).whenever(mainActivity).window
         // execute
         mainActivity.keepScreenOn()
         // validate

app/src/test/kotlin/com/vrem/wifianalyzer/DrawerNavigationTest.kt

@@ -44,7 +44,7 @@ class DrawerNavigationTest {
     @Before
     fun setUp() {
         doReturn(actionBarDrawerToggle).whenever(fixture).createDrawerToggle(drawerLayout)
-        whenever<Any>(mainActivity.findViewById(R.id.drawer_layout)).thenReturn(drawerLayout)
+        doReturn(drawerLayout).whenever(mainActivity).findViewById<View>(R.id.drawer_layout)
         fixture.create()
     }
 

app/src/test/kotlin/com/vrem/wifianalyzer/navigation/availability/BottomNavTest.kt

@@ -22,6 +22,7 @@ import com.vrem.wifianalyzer.MainActivity
 import com.vrem.wifianalyzer.R
 import org.junit.After
 import org.junit.Test
+import org.mockito.kotlin.doReturn
 import org.mockito.kotlin.mock
 import org.mockito.kotlin.verify
 import org.mockito.kotlin.verifyNoMoreInteractions
@@ -40,7 +41,7 @@ class BottomNavTest {
     @Test
     fun navigationOptionBottomNavOff() {
         // setup
-        whenever<View>(mainActivity.findViewById(R.id.nav_bottom)).thenReturn(view)
+        doReturn(view).whenever(mainActivity).findViewById<View>(R.id.nav_bottom)
         // execute
         navigationOptionBottomNavOff(mainActivity)
         // validate
@@ -51,7 +52,7 @@ class BottomNavTest {
     @Test
     fun navigationOptionBottomNavOn() {
         // setup
-        whenever<View>(mainActivity.findViewById(R.id.nav_bottom)).thenReturn(view)
+        doReturn(view).whenever(mainActivity).findViewById<View>(R.id.nav_bottom)
         // execute
         navigationOptionBottomNavOn(mainActivity)
         // validate

build.gradle

@@ -28,7 +28,7 @@ buildscript {
         gradlePluginPortal() // Added for plugin resolution
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.13.2'
+        classpath 'com.android.tools.build:gradle:9.0.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-allopen:$kotlin_version"
         classpath "com.github.ben-manes:gradle-versions-plugin:0.53.0"

gradle.properties

@@ -21,4 +21,27 @@ android.nonFinalResIds=true
 android.jetifier.ignorelist=bcprov-jdk15on
 
 # Kotlin code style
-kotlin.code.style=official
+kotlin.code.style=official
+
+# Remove these lines entirely (use new defaults):
+# new default is false
+android.defaults.buildfeatures.resvalues=true
+# new default is true
+android.sdk.defaultTargetSdkToCompileSdkIfUnset=false
+# new default is true
+android.enableAppCompileTimeRClass=false
+# new default is true
+android.usesSdkInManifest.disallowed=false
+# new default is true
+android.builtInKotlin=false
+# new default is true
+android.newDsl=false
+
+# Keep these if needed for your project:
+android.uniquePackageNames=false
+android.dependency.useConstraints=true
+android.r8.strictFullModeForKeepRules=false
+android.r8.optimizedResourceShrinking=false
+
+# Add this to suppress the constraint warning:
+android.generateSyncIssueWhenLibraryConstraintsAreEnabled=false

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip