Skip to content

Commit

Permalink
Merge pull request #2241 from instructure/release/student-7.0.0-256
Browse files Browse the repository at this point in the history
Release Student 7.0.0 (256)
  • Loading branch information
hermannakos authored Nov 20, 2023
2 parents fe47643 + 211128d commit 792f6cc
Show file tree
Hide file tree
Showing 1,535 changed files with 90,016 additions and 17,348 deletions.
10 changes: 5 additions & 5 deletions apps/flutter_parent/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@ if (keystorePropertiesFile.exists()) {
}

android {
compileSdkVersion 31
buildToolsVersion "30.0.2"
compileSdk 33

sourceSets {
main.java.srcDirs += 'src/main/kotlin'
Expand All @@ -47,7 +46,7 @@ android {
defaultConfig {
applicationId "com.instructure.parentapp"
minSdkVersion 26
targetSdkVersion 31
targetSdk 33
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
Expand Down Expand Up @@ -92,22 +91,23 @@ android {
}
}
}
namespace 'com.instructure.parentapp'
}

flutter {
source '../..'
}

dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.30"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.20"

testImplementation 'junit:junit:4.12'

androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
implementation "com.squareup.okhttp3:okhttp:4.9.1"
implementation 'org.jsoup:jsoup:1.11.3'
implementation 'com.google.gms:google-services:4.3.3'
implementation 'com.google.gms:google-services:4.3.14'
}

apply plugin: 'com.google.firebase.crashlytics'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.instructure.parentapp">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Flutter needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc.
-->
Expand Down
7 changes: 4 additions & 3 deletions apps/flutter_parent/android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.instructure.parentapp">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<!-- io.flutter.app.FlutterApplication is an android.app.Application that
calls FlutterMain.startInitialization(this); in its onCreate method.
Expand All @@ -13,6 +12,7 @@
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
android:maxSdkVersion="29"/>
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/> <!-- For notifications plugin -->
<uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />

<application
android:label="Canvas Parent"
Expand Down Expand Up @@ -83,7 +83,8 @@

<receiver android:name="com.dexterous.flutterlocalnotifications.ScheduledNotificationReceiver" />

<receiver android:name="com.dexterous.flutterlocalnotifications.ScheduledNotificationBootReceiver">
<receiver android:name="com.dexterous.flutterlocalnotifications.ScheduledNotificationBootReceiver"
android:exported="false">
<intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED"/>
</intent-filter>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.instructure.parentapp">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Flutter needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc.
-->
Expand Down
10 changes: 5 additions & 5 deletions apps/flutter_parent/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ buildscript {
}

dependencies {
classpath "com.android.tools.build:gradle:4.1.0"
classpath "com.google.firebase:firebase-crashlytics-gradle:2.1.0"
classpath "com.google.gms:google-services:4.3.10"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.30"
classpath 'com.android.tools.build:gradle:7.4.2'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.5.2'
classpath "com.google.gms:google-services:4.3.14"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20"
}
}

Expand All @@ -27,6 +27,6 @@ subprojects {
project.evaluationDependsOn(':app')
}

task clean(type: Delete) {
tasks.register("clean", Delete) {
delete rootProject.buildDir
}
2 changes: 1 addition & 1 deletion apps/flutter_parent/android/buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ repositories {
mavenCentral()
}

val agpVersion = "4.1.0"
val agpVersion = "7.4.2"

dependencies {
implementation("com.android.tools.build:gradle:$agpVersion")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,6 @@ class TimingsListener implements TaskExecutionListener, BuildListener {

}

@Override
void buildStarted(Gradle gradle) {}

@Override
void projectsEvaluated(Gradle gradle) {}

Expand Down
2 changes: 1 addition & 1 deletion apps/flutter_parent/android/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
org.gradle.jvmargs=-Xmx1536M
android.useAndroidX=true
android.enableJetifier=true
android.enableR8=true
android.enableR8=true
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
12 changes: 6 additions & 6 deletions apps/flutter_parent/assets/svg/canvas-parent-login-logo-dark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 6 additions & 6 deletions apps/flutter_parent/assets/svg/canvas-parent-login-logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion apps/flutter_parent/flutter_parent_sdk_url
Original file line number Diff line number Diff line change
@@ -1 +1 @@
https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_2.5.3-stable.tar.xz
https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.13.2-stable.tar.xz
Loading

0 comments on commit 792f6cc

Please sign in to comment.