Merge pull request #2537 from instructure/release/parent-3.11.0-51

Release Parent 3.11.0 (51)
instructure · Aug 29, 2024 · 4e0c1fa · 4e0c1fa
2 parents 1a6401d + 1a39dde
commit 4e0c1fa
Show file tree

Hide file tree

Showing 981 changed files with 63,999 additions and 33,401 deletions.
diff --git a/android-vault b/android-vault
diff --git a/apps/build.gradle b/apps/build.gradle
@@ -33,7 +33,6 @@ buildscript {
         classpath Plugins.KOTLIN
         classpath Plugins.FIREBASE_CRASHLYTICS
         if (project.coverageEnabled) { classpath Plugins.JACOCO_ANDROID }
-        classpath Plugins.SQLDELIGHT
         classpath Plugins.HILT
         classpath Plugins.HEAP
     }

diff --git a/apps/flutter_parent/android/app/build.gradle b/apps/flutter_parent/android/app/build.gradle
@@ -33,7 +33,7 @@ if (keystorePropertiesFile.exists()) {
 }
 
 android {
-    compileSdk 33
+    compileSdk 34
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -46,7 +46,7 @@ android {
     defaultConfig {
         applicationId "com.instructure.parentapp"
         minSdkVersion 26
-        targetSdk 33
+        targetSdk 34
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

diff --git a/apps/flutter_parent/lib/l10n/app_localizations.dart b/apps/flutter_parent/lib/l10n/app_localizations.dart
@@ -1715,4 +1715,14 @@ class AppLocalizations {
 
   String get needToEnablePermission =>
       Intl.message('You need to enable exact alarm permission for this action', desc: 'Error message when the user tries to set a reminder without the permission');
+
+  String get submissionAndRubric => Intl.message(
+      'Submission & Rubric',
+      desc: 'Button text for Submission and Rubric on Assignment Details Screen'
+  );
+
+  String get submission => Intl.message(
+      'Submission',
+      desc: 'Title for WebView screen when opening submission'
+  );
 }