diff --git a/.gitignore b/.gitignore index 566e06b..b8a02bd 100644 --- a/.gitignore +++ b/.gitignore @@ -24,4 +24,24 @@ hs_err_pid* replay_pid* # Kotlin Gradle plugin data, see https://kotlinlang.org/docs/whatsnew20.html#new-directory-for-kotlin-data-in-gradle-projects -.kotlin/ \ No newline at end of file +.kotlin/ + +# Gradle +.gradle/ +build/ +!gradle/wrapper/gradle-wrapper.jar + +# Android +local.properties +*.apk +*.aab +*.ap_ +*.dex +captures/ +.externalNativeBuild/ +.cxx/ +*.hprof + +# IDE +.idea/ +*.iml \ No newline at end of file diff --git a/.idea/appInsightsSettings.xml b/.idea/appInsightsSettings.xml new file mode 100644 index 0000000..a3408d0 --- /dev/null +++ b/.idea/appInsightsSettings.xml @@ -0,0 +1,23 @@ + + + + + + \ No newline at end of file diff --git a/.idea/caches/deviceStreaming.xml b/.idea/caches/deviceStreaming.xml new file mode 100644 index 0000000..2cfab22 --- /dev/null +++ b/.idea/caches/deviceStreaming.xml @@ -0,0 +1,1358 @@ + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..b86273d --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml new file mode 100644 index 0000000..b7f8ad6 --- /dev/null +++ b/.idea/deploymentTargetSelector.xml @@ -0,0 +1,18 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index b838237..97f0a8e 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -6,6 +6,12 @@ diff --git a/.idea/misc.xml b/.idea/misc.xml index 3040d03..74dd639 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,7 +1,7 @@ - + diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 9bb367a..bc27754 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -47,7 +47,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion = "1.5.8" + kotlinCompilerExtensionVersion = "1.5.10" } packaging { @@ -64,7 +64,7 @@ dependencies { implementation("androidx.activity:activity-compose:1.8.2") // Compose - implementation(platform("androidx.compose:compose-bom:2024.01.00")) + implementation(platform("androidx.compose:compose-bom:2024.09.00")) implementation("androidx.compose.ui:ui") implementation("androidx.compose.ui:ui-graphics") implementation("androidx.compose.ui:ui-tooling-preview") @@ -103,7 +103,7 @@ dependencies { testImplementation("junit:junit:4.13.2") androidTestImplementation("androidx.test.ext:junit:1.1.5") androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1") - androidTestImplementation(platform("androidx.compose:compose-bom:2024.01.00")) + androidTestImplementation(platform("androidx.compose:compose-bom:2024.09.00")) androidTestImplementation("androidx.compose.ui:ui-test-junit4") debugImplementation("androidx.compose.ui:ui-tooling") debugImplementation("androidx.compose.ui:ui-test-manifest") diff --git a/app/src/main/java/com/fastmask/data/api/JmapModels.kt b/app/src/main/java/com/fastmask/data/api/JmapModels.kt index f0116c9..ca4e8bc 100644 --- a/app/src/main/java/com/fastmask/data/api/JmapModels.kt +++ b/app/src/main/java/com/fastmask/data/api/JmapModels.kt @@ -48,7 +48,7 @@ data class MaskedEmailGetResponse( data class MaskedEmailSetResponse( val accountId: String, val oldState: String? = null, - val newState: String, + val newState: String? = null, val created: Map? = null, val updated: Map? = null, val destroyed: List? = null, diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..d64cd49 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ