Skip to content

Commit

Permalink
Release Teacher 1.31.0 (68)
Browse files Browse the repository at this point in the history
  • Loading branch information
tamaskozmer authored Jun 10, 2024
2 parents b09bbb5 + 3b1c9fc commit 421f79f
Show file tree
Hide file tree
Showing 604 changed files with 32,643 additions and 44,987 deletions.
2,753 changes: 2,753 additions & 0 deletions apps/flutter_parent/lib/l10n/res/intl_ga.arb

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion apps/flutter_parent/lib/utils/alert_helper.dart
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class AlertsHelper {
filteredList.add(element);
} else {
Course? course = await locator<CourseApi>().getCourse(courseId, forceRefresh: false);
if (course?.settings?.restrictQuantitativeData == false) {
if (!(course?.settings?.restrictQuantitativeData ?? false)) {
filteredList.add(element);
}
}
Expand Down
2 changes: 1 addition & 1 deletion apps/flutter_parent/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ description: Canvas Parent
# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
# Read more about iOS versioning at
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
version: 3.9.1+49
version: 3.10.0+50

module:
androidX: true
Expand Down
1 change: 0 additions & 1 deletion apps/flutter_sdk_url

This file was deleted.

7 changes: 1 addition & 6 deletions apps/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
android.enableJetifier=true
android.useAndroidX=true
org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8

# Flutter embed
target-platform=android-x64,android-arm,android-arm64
flutter.hostAppProjectName=:student
org.gradle.workers.max=1
org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
58 changes: 58 additions & 0 deletions apps/parent/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
# Private data
google-services.json
src/main/res/xml/analytics.xml
src/main/res/values/private_strings.xml
private.properties

# built application files #
*.apk
*.ap_

# files for the dex VM #
*.dex

# Java class files #
*.class

# generated files #
bin
gen
target

# Local configuration file (sdk path, etc) #
local.properties

# Windows thumbnail db #
Thumbs.db

# OSX files
.DS_Store

# Eclipse project files #
.classpath
.project

# Android Studio #
.idea
*.iml
build
*.iws

# Package Files #
*.jar
*.war
*.ear

# Project Files #
.gitconfig

# Gradle Files #
gradle.properties
.gradle

# OSS License data
src/main/res/raw/third_party_license_metadata
src/main/res/raw/third_party_licenses

# Flank
results/
209 changes: 209 additions & 0 deletions apps/parent/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,209 @@
/*
* Copyright (C) 2024 - present Instructure, Inc.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, version 3 of the License.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/

plugins {
id 'com.android.application'
id 'com.google.gms.google-services'
id 'org.jetbrains.kotlin.android'
id 'kotlin-kapt'
id 'com.google.firebase.crashlytics'
id 'dagger.hilt.android.plugin'
}

configurations {
all*.exclude group: 'commons-logging', module: 'commons-logging'
all*.exclude group: 'org.apache.httpcomponents', module: 'httpclient'
}

def coverageEnabled = project.hasProperty('coverage')

android {
namespace 'com.instructure.parentapp'
compileSdk Versions.COMPILE_SDK

defaultConfig {
applicationId "com.instructure.parentapp"
minSdkVersion Versions.MIN_SDK
targetSdkVersion Versions.TARGET_SDK
versionCode 50
versionName "3.10.0"

/* Add private data */
PrivateData.merge(project, "parent")
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

packagingOptions {
exclude 'META-INF/maven/com.google.guava/guava/pom.xml'
exclude 'META-INF/maven/com.google.guava/guava/pom.properties'
exclude 'META-INF/DEPENDENCIES'
exclude 'META-INF/LICENSE'
exclude 'META-INF/LICENSE.txt'
exclude 'META-INF/NOTICE'
exclude 'META-INF/rxjava.properties'
exclude 'LICENSE.txt'
}


lintOptions {
abortOnError false
}

flavorDimensions 'default'

productFlavors {
dev {
dimension 'default'
}

qa {
buildConfigField "boolean", "IS_TESTING", "true"
dimension 'default'
}

prod {
dimension 'default'
}
}

buildTypes {
debug {
testCoverageEnabled = coverageEnabled
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
minifyEnabled false
shrinkResources false
pseudoLocalesEnabled true

firebaseCrashlytics {
// If you don't need crash reporting for your debug build,
// you can speed up your build by disabling mapping file uploading.
mappingFileUploadEnabled false
}
}

debugMinify {
initWith debug
debuggable false
minifyEnabled true
shrinkResources true
matchingFallbacks = ['debug']
}

release {
minifyEnabled true
shrinkResources true
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}

configurations.all {
resolutionStrategy.force 'com.google.code.findbugs:jsr305:1.3.9'
/*
Resolves dependency versions across test and production APKs, specifically, transitive
dependencies. This is required since Espresso internally has a dependency on support-annotations.
https://github.com/googlecodelabs/android-testing/blob/57852eaf7df88ddaf828eca879a407f2249d5348/app/build.gradle#L86
*/
resolutionStrategy.force Libs.ANDROIDX_ANNOTATION

resolutionStrategy.force Libs.KOTLIN_COROUTINES_CORE
resolutionStrategy.force Libs.KOTLIN_STD_LIB
}

configurations.implementation.dependencies.each { compileDependency ->
println "Excluding compile dependency: ${compileDependency.getName()}"
configurations.androidTestImplementation.dependencies.each { androidTestCompileDependency ->
configurations.androidTestImplementation.exclude module: "${compileDependency.getName()}"
}
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
kotlinOptions {
jvmTarget = '1.8'
}
buildFeatures {
viewBinding true
dataBinding true
}
hilt {
enableAggregatingTask = false
enableExperimentalClasspathAggregation = true
}
}

dependencies {

implementation fileTree(dir: 'libs', include: ['*.jar'])

/* Project Modules */
implementation project(path: ':login-api-2')

/* Android Test Dependencies */
androidTestImplementation project(path: ':espresso')
androidTestImplementation project(':dataseedingapi')

/* Unit Test Dependencies */
testImplementation Libs.JUNIT
testImplementation Libs.ROBOLECTRIC
testImplementation Libs.ANDROIDX_TEST_JUNIT
testImplementation Libs.MOCKK
androidTestImplementation Libs.ANDROIDX_TEST_JUNIT
testImplementation Libs.KOTLIN_COROUTINES_TEST
testImplementation Libs.THREETEN_BP
testImplementation Libs.ANDROIDX_CORE_TESTING

/* Firebase */
implementation platform(Libs.FIREBASE_BOM) {
exclude group: 'com.google.firebase', module: 'firebase-analytics'
}
implementation Libs.FIREBASE_MESSAGING
implementation Libs.FIREBASE_CRASHLYTICS_NDK
implementation(Libs.FIREBASE_CRASHLYTICS) {
transitive = true
}

/* Kotlin */
implementation Libs.KOTLIN_STD_LIB

/* DI */
implementation Libs.HILT
kapt Libs.HILT_COMPILER
implementation Libs.HILT_ANDROIDX_WORK
kapt Libs.HILT_ANDROIDX_COMPILER

/* ROOM */
implementation Libs.ROOM
kapt Libs.ROOM_COMPILER
implementation Libs.ROOM_COROUTINES

/* Navigation */
implementation Libs.NAVIGATION_FRAGMENT
implementation Libs.NAVIGATION_KTX

/* Support dependencies */
implementation Libs.ANDROIDX_ANNOTATION
implementation Libs.ANDROIDX_APPCOMPAT
implementation Libs.ANDROIDX_BROWSER
implementation Libs.ANDROIDX_CARDVIEW
implementation Libs.ANDROIDX_CONSTRAINT_LAYOUT
implementation Libs.ANDROIDX_DESIGN
implementation Libs.ANDROIDX_RECYCLERVIEW
implementation Libs.ANDROIDX_PALETTE
implementation Libs.PLAY_IN_APP_UPDATES
}
Loading

0 comments on commit 421f79f

Please sign in to comment.