Merge pull request #2746 from instructure/release/teacher-1.37.0-74

Release Teacher 1.37.0 (74)

buildSrc/build.gradle.kts → apps/buildSrc/build.gradle.kts

@@ -19,7 +19,7 @@ repositories {
     mavenCentral()
 }
 
-val agpVersion= "7.4.2"
+val agpVersion= "8.6.1"
 val kotlinVersion = "2.0.21"
 
 dependencies {

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

@@ -7,7 +7,7 @@ object Versions {
     const val TARGET_SDK = 34
 
     /* Build/tooling */
-    const val ANDROID_GRADLE_TOOLS = "7.4.2"
+    const val ANDROID_GRADLE_TOOLS = "8.6.1"
     const val BUILD_TOOLS = "34.0.0"
 
     /* Testing */
@@ -42,6 +42,7 @@ object Versions {
     const val MEDIA3 = "1.4.1"
     const val DATASTORE = "1.1.1"
     const val LOTTIE = "6.5.2"
+    const val ENCRYPTED_SHARED_PREFERENCES = "1.0.0"
 }
 
 object Libs {
@@ -77,6 +78,7 @@ object Libs {
     const val ANDROIDX_DATABINDING_COMPILER = "androidx.databinding:databinding-compiler:${Versions.ANDROID_GRADLE_TOOLS}" // This is bundled with the gradle plugin so we use the same version
     const val ANDROIDX_COMPOSE_ACTIVITY = "androidx.activity:activity-compose:1.9.0"
     const val DATASTORE = "androidx.datastore:datastore-preferences:${Versions.DATASTORE}"
+    const val ENCRYPTED_SHARED_PREFERENCES = "androidx.security:security-crypto:${Versions.ENCRYPTED_SHARED_PREFERENCES}"
 
     /* Firebase */
     const val FIREBASE_BOM = "com.google.firebase:firebase-bom:33.4.0"

apps/flutter_parent/android/app/src/main/res/drawable/ic_launcher_foreground.xml

@@ -0,0 +1,23 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="72"
+    android:viewportHeight="72">
+  <group android:scaleX="0.66"
+      android:scaleY="0.66"
+      android:translateX="12.24"
+      android:translateY="12.24">
+    <group>
+      <clip-path
+          android:pathData="M0,0h72v72h-72z"/>
+      <path
+          android:pathData="M28.797,10.669C31.128,9.994 33.592,9.633 36.141,9.633C38.689,9.633 41.153,9.994 43.485,10.669C42.98,14.274 39.885,17.049 36.141,17.049C32.397,17.049 29.301,14.274 28.797,10.669ZM61.472,28.656C62.146,30.987 62.508,33.451 62.508,36C62.508,38.549 62.146,41.013 61.472,43.344C57.867,42.84 55.092,39.744 55.092,36C55.092,32.256 57.867,29.16 61.472,28.656ZM59.244,48.717C56.835,53.084 53.224,56.694 48.858,59.103C46.667,56.197 46.894,52.048 49.541,49.401C52.188,46.754 56.338,46.526 59.244,48.717ZM43.485,61.331C41.153,62.006 38.689,62.367 36.141,62.367C33.592,62.367 31.128,62.006 28.797,61.331C29.301,57.726 32.397,54.951 36.141,54.951C39.885,54.951 42.98,57.726 43.485,61.331ZM23.423,59.103C19.057,56.694 15.446,53.084 13.038,48.717C15.943,46.526 20.093,46.754 22.74,49.401C25.387,52.048 25.615,56.197 23.423,59.103ZM10.81,43.344C10.135,41.013 9.773,38.549 9.773,36C9.773,33.451 10.135,30.987 10.81,28.656C14.415,29.16 17.189,32.256 17.189,36C17.189,39.744 14.415,42.84 10.81,43.344ZM13.038,23.282C15.446,18.916 19.057,15.306 23.423,12.897C25.615,15.802 25.387,19.952 22.74,22.599C20.093,25.246 15.943,25.474 13.038,23.282ZM36.141,24.464C34.775,24.464 33.669,23.358 33.669,21.992C33.669,20.627 34.775,19.521 36.141,19.521C37.506,19.521 38.612,20.627 38.612,21.992C38.612,23.358 37.506,24.464 36.141,24.464ZM47.676,36C47.676,34.635 48.783,33.528 50.148,33.528C51.513,33.528 52.62,34.635 52.62,36C52.62,37.365 51.513,38.472 50.148,38.472C48.783,38.472 47.676,37.365 47.676,36ZM44.298,44.157C45.263,43.192 46.828,43.192 47.793,44.157C48.759,45.122 48.759,46.687 47.793,47.653C46.828,48.618 45.263,48.618 44.298,47.653C43.332,46.687 43.332,45.122 44.298,44.157ZM36.141,47.536C37.506,47.536 38.612,48.642 38.612,50.008C38.612,51.373 37.506,52.479 36.141,52.479C34.775,52.479 33.669,51.373 33.669,50.008C33.669,48.642 34.775,47.536 36.141,47.536ZM27.984,44.157C28.949,45.122 28.949,46.687 27.984,47.653C27.018,48.618 25.453,48.618 24.488,47.653C23.522,46.687 23.522,45.122 24.488,44.157C25.453,43.192 27.018,43.192 27.984,44.157ZM24.605,36C24.605,37.365 23.498,38.472 22.133,38.472C20.768,38.472 19.661,37.365 19.661,36C19.661,34.635 20.768,33.528 22.133,33.528C23.498,33.528 24.605,34.635 24.605,36ZM27.984,27.843C27.018,28.808 25.453,28.808 24.488,27.843C23.522,26.878 23.522,25.313 24.488,24.347C25.453,23.382 27.018,23.382 27.984,24.347C28.949,25.313 28.949,26.878 27.984,27.843Z"
+          android:fillColor="#2573DF"
+          android:fillType="evenOdd"/>
+      <path
+          android:pathData="M51.363,30.727C56.858,30.727 61.313,26.272 61.313,20.777C61.313,15.283 56.858,10.828 51.363,10.828C45.868,10.828 41.414,15.283 41.414,20.777C41.414,26.272 45.868,30.727 51.363,30.727ZM49.279,20.762C49.279,21.93 50.23,22.881 51.398,22.881C52.567,22.881 53.518,21.93 53.518,20.762C53.518,19.593 52.567,18.643 51.398,18.643C50.23,18.643 49.279,19.593 49.279,20.762ZM51.398,16.524C54.047,16.524 56.468,18.087 57.719,20.604L57.797,20.762L57.719,20.919C56.468,23.436 54.047,25 51.398,25C48.75,25 46.329,23.436 45.078,20.919L45,20.762L45.078,20.604C46.329,18.087 48.75,16.524 51.398,16.524Z"
+          android:fillColor="#2573DF"
+          android:fillType="evenOdd"/>
+    </group>
+  </group>
+</vector>

apps/flutter_parent/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -15,6 +15,7 @@
   ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+    <background android:drawable="@color/white"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <monochrome android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>

apps/flutter_parent/android/app/src/main/res/values/colors.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="parentApp">#007BC2</color>
+    <color name="parentApp">#2573DF</color>
+    <color name="white">#FFFFFF</color>
 </resources>

apps/flutter_parent/android/buildSrc/build.gradle.kts

@@ -24,8 +24,6 @@ val agpVersion = "7.4.2"
 dependencies {
     implementation("com.android.tools.build:gradle:$agpVersion")
     implementation("com.android.tools.build:gradle-api:$agpVersion")
-    implementation("org.javassist:javassist:3.24.1-GA")
-    implementation("com.google.code.gson:gson:2.8.8")
 }
 
 plugins {