Merge pull request #5 from mhss1/dev

Dev
mhss1 · Oct 6, 2023 · bf74e82 · bf74e82
2 parents b8c83cf + 6c723e1
commit bf74e82
Show file tree

Hide file tree

Showing 37 changed files with 11,622 additions and 94 deletions.
diff --git a/.idea/androidTestResultsUserPreferences.xml b/.idea/androidTestResultsUserPreferences.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -4,7 +4,6 @@ plugins {
     id 'com.google.dagger.hilt.android'
     id 'org.jetbrains.kotlin.plugin.serialization'
     id 'com.google.devtools.ksp'
-    id 'kotlin-kapt'
 }
 
 android {
@@ -15,19 +14,13 @@ android {
         applicationId "com.mo.sh.studyassistant"
         minSdk 26
         targetSdk 34
-        versionCode 1
-        versionName "1.0.0"
+        versionCode 2
+        versionName "1.0.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
             useSupportLibrary true
         }
-
-        kapt {
-            arguments {
-                arg("room.schemaLocation", "$projectDir/schemas")
-            }
-        }
     }
 
     buildTypes {
@@ -39,20 +32,26 @@ android {
         debug {
             applicationIdSuffix ".debug"
         }
+        benchmark {
+            initWith release
+            signingConfig signingConfigs.debug
+            matchingFallbacks = ['release']
+            debuggable false
+        }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17'
     }
     buildFeatures {
         compose true
         buildConfig true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion '1.3.2'
+        kotlinCompilerExtensionVersion '1.5.2'
     }
     packagingOptions {
         resources {
@@ -66,15 +65,15 @@ android {
 
 dependencies {
     def room_version = "2.5.2"
-    def nav_version = "2.7.0-rc01"
-    def lifecycle_version = "2.6.1"
+    def nav_version = "2.7.3"
+    def lifecycle_version = "2.6.2"
     def ktor_version = "2.0.0"
 
-    implementation 'androidx.core:core-ktx:1.10.1'
-    implementation platform('org.jetbrains.kotlin:kotlin-bom:1.8.0')
+    implementation 'androidx.core:core-ktx:1.12.0'
+    implementation platform('org.jetbrains.kotlin:kotlin-bom:1.9.0')
     implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
     implementation 'androidx.activity:activity-compose:1.7.2'
-    implementation platform('androidx.compose:compose-bom:2022.10.00')
+    implementation platform('androidx.compose:compose-bom:2023.09.02')
     implementation 'androidx.compose.ui:ui'
     implementation 'androidx.compose.ui:ui-graphics'
     implementation 'androidx.compose.ui:ui-tooling-preview'
@@ -88,8 +87,8 @@ dependencies {
     debugImplementation 'androidx.compose.ui:ui-test-manifest'
 
     // Hilt
-    implementation "com.google.dagger:hilt-android:2.44"
-    kapt "com.google.dagger:hilt-compiler:2.44"
+    implementation "com.google.dagger:hilt-android:2.48"
+    ksp "com.google.dagger:hilt-compiler:2.48"
 
     // Navigation
     implementation "androidx.navigation:navigation-compose:$nav_version"
@@ -130,7 +129,7 @@ dependencies {
     implementation "io.ktor:ktor-client-logging:$ktor_version"
     implementation "ch.qos.logback:logback-classic:1.2.10"
     implementation "io.ktor:ktor-client-content-negotiation:$ktor_version"
-    implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.1'
+    implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.0'
 
     // Compose markdown
     implementation 'com.github.jeziellago:compose-markdown:0.3.4'
@@ -140,8 +139,11 @@ dependencies {
 
     // Squircle shape
     implementation "com.github.stoyan-vuchev:squircle-shape:1.0.3"
+
+    // Baseline profiler
+    implementation "androidx.profileinstaller:profileinstaller:1.3.1"
 }
 
-kapt {
-    correctErrorTypes true
+ksp {
+    arg("room.schemaLocation", "$projectDir/schemas")
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -50,9 +50,6 @@
         </activity>
         <activity android:name="com.canhub.cropper.CropImageActivity"
             android:theme="@style/Base.Theme.AppCompat"/> <!-- optional (needed if default theme has no action bar) -->
-        <meta-data
-            android:name="preloaded_fonts"
-            android:resource="@array/preloaded_fonts" />
 
     </application>