Release Teacher 1.39.0 (77) (#2914)

Release Teacher 1.39.0 (77)

Author: hermannakos

android-vault

@@ -34,13 +34,15 @@ buildscript {
         classpath Plugins.FIREBASE_CRASHLYTICS
         if (project.coverageEnabled) { classpath Plugins.JACOCO_ANDROID }
         classpath Plugins.HILT
-        classpath Plugins.HEAP
     }
 }
 
 allprojects {
     repositories {
         google()
+        maven {
+            url = uri("https://software.mobile.pendo.io/artifactory/androidx-release")
+        }
         mavenCentral()
         maven { url 'https://jitpack.io' }
         maven {

apps/build.gradle

@@ -23,7 +23,7 @@ object Versions {
     const val GOOGLE_SERVICES = "4.4.2"
 
     /* Others */
-    const val APOLLO = "2.5.14" // There is already a brand new version, Apollo 3, that requires lots of migration
+    const val APOLLO = "4.1.1"
     const val PSPDFKIT = "2024.3.1"
     const val PHOTO_VIEW = "2.3.0"
     const val MOBIUS = "1.2.1"
@@ -35,7 +35,6 @@ object Versions {
     const val GLIDE_VERSION = "4.16.0"
     const val RETROFIT = "2.11.0"
     const val OKHTTP = "4.12.0"
-    const val HEAP = "1.10.6"
     const val ROOM = "2.6.1"
     const val HAMCREST = "2.2"
     const val NAVIGATION = "2.8.3"
@@ -54,7 +53,7 @@ object Libs {
 
     /* Apollo/GraphQL */
     const val APOLLO_RUNTIME = "com.apollographql.apollo:apollo-runtime:${Versions.APOLLO}"
-    const val APOLLO_ANDROID_SUPPORT = "com.apollographql.apollo:apollo-android-support:${Versions.APOLLO}"
+    const val APOLLO_API = "com.apollographql.apollo:apollo-api:${Versions.APOLLO}"
     const val APOLLO_HTTP_CACHE = "com.apollographql.apollo:apollo-http-cache:${Versions.APOLLO}"
 
     /* Androidx libraries */
@@ -165,7 +164,7 @@ object Libs {
     const val APACHE_COMMONS_TEXT = "org.apache.commons:commons-text:1.12.0"
     const val CAMERA_VIEW = "com.otaliastudios:cameraview:2.7.2"
 
-    const val HEAP_CORE = "com.contentsquare.android:sdk:0.3.0"
+    const val PENDO = "sdk.pendo.io:pendoIO:3.6+"
 
     const val ROOM = "androidx.room:room-runtime:${Versions.ROOM}"
     const val ROOM_COMPILER = "androidx.room:room-compiler:${Versions.ROOM}"
@@ -185,6 +184,7 @@ object Libs {
     const val COMPOSE_UI = "androidx.compose.ui:ui-android"
     const val COMPOSE_UI_TEST = "androidx.compose.ui:ui-test-junit4"
     const val COMPOSE_UI_TEST_MANIFEST = "androidx.compose.ui:ui-test-manifest"
+    const val COMPOSE_MATERIAL_3 = "androidx.compose.material3:material3"
 
     // Navigation
     const val NAVIGATION_FRAGMENT = "androidx.navigation:navigation-fragment-ktx:${Versions.NAVIGATION}"
@@ -200,5 +200,4 @@ object Plugins {
     const val GOOGLE_SERVICES = "com.google.gms:google-services:${Versions.GOOGLE_SERVICES}"
     const val JACOCO_ANDROID = "com.dicedmelon.gradle:jacoco-android:${Versions.JACOCO_ANDROID}"
     const val HILT = "com.google.dagger:hilt-android-gradle-plugin:${Versions.HILT}"
-    const val HEAP = "io.heap.gradle:io.heap.gradle.gradle.plugin:0.5.0"
 }

apps/buildSrc/src/main/java/GlobalDependencies.kt

@@ -23,7 +23,6 @@ plugins {
     id 'com.google.firebase.crashlytics'
     id 'dagger.hilt.android.plugin'
     id 'org.jetbrains.kotlin.plugin.compose'
-    id 'io.heap.gradle'
 }
 
 configurations {
@@ -99,7 +98,7 @@ android {
                 mappingFileUploadEnabled false
             }
 
-            buildConfigField "String", "HEAP_APP_ID", "\"$heapStagingId\""
+            buildConfigField "String", "PENDO_TOKEN", "\"$pendoAccessToken\""
         }
 
         debugMinify {
@@ -115,7 +114,7 @@ android {
             shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
 
-            buildConfigField "String", "HEAP_APP_ID", "\"$heapProductionId\""
+            buildConfigField "String", "PENDO_TOKEN", "\"$pendoAccessToken\""
         }
     }
 
@@ -227,5 +226,5 @@ dependencies {
 
     implementation Libs.ENCRYPTED_SHARED_PREFERENCES
 
-    implementation Libs.HEAP_CORE
+    implementation Libs.PENDO
 }

apps/parent/build.gradle

@@ -251,4 +251,7 @@
 
 # AGP 8 update
 -dontwarn java.beans.MethodDescriptor
--dontwarn java.beans.SimpleBeanInfo
+-dontwarn java.beans.SimpleBeanInfo
+
+-keep class androidx.navigation.** { *; }
+    -keep interface androidx.navigation.** { *; }

apps/parent/proguard-rules.txt

@@ -64,7 +64,8 @@ class AnnouncementDetailsScreenTest {
             AnnouncementDetailsScreen(
                 uiState = uiState,
                 navigationActionClick = {},
-                actionHandler = {}
+                actionHandler = {},
+                applyOnWebView = {}
             )
         }
 
@@ -105,7 +106,8 @@ class AnnouncementDetailsScreenTest {
             AnnouncementDetailsScreen(
                 uiState = uiState,
                 navigationActionClick = {},
-                actionHandler = {}
+                actionHandler = {},
+                applyOnWebView = {}
             )
         }
 
@@ -135,7 +137,8 @@ class AnnouncementDetailsScreenTest {
                     studentColor = Color.BLUE,
                 ),
                 navigationActionClick = {},
-                actionHandler = {}
+                actionHandler = {},
+                applyOnWebView = {}
             )
         }
 
@@ -156,7 +159,8 @@ class AnnouncementDetailsScreenTest {
                     studentColor = Color.BLUE,
                 ),
                 navigationActionClick = {},
-                actionHandler = {}
+                actionHandler = {},
+                applyOnWebView = {}
             )
         }
 
@@ -174,7 +178,8 @@ class AnnouncementDetailsScreenTest {
                     studentColor = Color.BLUE,
                 ),
                 navigationActionClick = {},
-                actionHandler = {}
+                actionHandler = {},
+                applyOnWebView = {}
             )
         }
 

apps/parent/src/androidTest/java/com/instructure/parentapp/ui/compose/alerts/details/AnnouncementDetailsScreenTest.kt

@@ -129,4 +129,20 @@ class SummaryScreenTest {
         composeTestRule.onNodeWithText("No Due Date")
             .assertIsDisplayed()
     }
-}
+
+    @Test
+    fun assertRefreshing() {
+        composeTestRule.setContent {
+            SummaryContent(
+                uiState = SummaryUiState(
+                    state = ScreenState.Refreshing
+                ),
+                onRefresh = {},
+                navigateToAssignmentDetails = { _, _ -> },
+                navigateToCalendarEvent = { _, _, _ -> }
+            )
+        }
+
+        composeTestRule.onNodeWithTag("pullRefreshIndicator").assertIsDisplayed()
+    }
+}

apps/parent/src/androidTest/java/com/instructure/parentapp/ui/compose/courses/details/summary/SummaryScreenTest.kt

@@ -60,8 +60,8 @@ class ManageStudentsScreenTest {
         composeTestRule.onNodeWithText("You are not observing any students.")
             .assertIsDisplayed()
         composeTestRule.onNodeWithTag("EmptyContent")
-            .performScrollToNode(hasText("Retry"))
-        composeTestRule.onNodeWithText("Retry")
+            .performScrollToNode(hasText("Refresh"))
+        composeTestRule.onNodeWithText("Refresh")
             .assertIsDisplayed()
             .assertHasClickAction()
         composeTestRule.onNodeWithTag(R.drawable.panda_manage_students.toString())