Merge branch 'master' into navigation_implementation

# Conflicts:
#	app/src/main/java/com/appttude/h_mal/farmr/ui/FragmentAddItem.kt
#	app/src/main/java/com/appttude/h_mal/farmr/ui/MainActivity.kt
#	app/src/main/java/com/appttude/h_mal/farmr/ui/ShiftListAdapter.kt
#	app/src/main/java/com/appttude/h_mal/farmr/utils/Formatting.kt
This commit is contained in:
2023-09-10 17:02:13 +01:00
17 changed files with 192 additions and 61 deletions

View File

@@ -27,8 +27,8 @@ KOTLIN_VERSION = 1.7.10
GRADLE_ANALYZE_VERSION = 1.20.0
# Android configuration
COMPILE_SDK_VERSION = android-31
TARGET_SDK_VERSION = 31
COMPILE_SDK_VERSION = android-33
TARGET_SDK_VERSION = 33
MIN_SDK_VERSION = 21
# Gradle parameters