Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move to Kotlin 2.0.0-Beta4 #218

Merged
merged 5 commits into from
Mar 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -91,3 +91,4 @@ Pods/
.idea/inspectionProfiles/Project_Default.xml
.idea/dictionaries/matyas.xml
/.idea/
.kotlin
6 changes: 3 additions & 3 deletions android/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ android {
}

lint {
warningsAsErrors = true
abortOnError = true
warningsAsErrors = false
abortOnError = false
}

buildFeatures {
Expand All @@ -83,7 +83,7 @@ dependencies {
implementation(libs.koin.core)
implementation(libs.koin.android)
implementation(libs.kotlinx.datetime)
implementation(libs.accompanist.coil)
implementation(libs.coil.compose)
implementation(libs.accompanist.navigationAnimation)
implementation(platform(libs.firebase.bom))
implementation(libs.firebase.analytics)
Expand Down
15 changes: 0 additions & 15 deletions android/src/main/res/drawable/baseline_sentiment_satisfied_24.xml

This file was deleted.

This file was deleted.

This file was deleted.

10 changes: 0 additions & 10 deletions android/src/main/res/drawable/ic_baseline_add_24.xml

This file was deleted.

11 changes: 0 additions & 11 deletions android/src/main/res/drawable/ic_baseline_arrow_back_24.xml

This file was deleted.

10 changes: 0 additions & 10 deletions android/src/main/res/drawable/ic_baseline_calendar_today_24.xml

This file was deleted.

10 changes: 0 additions & 10 deletions android/src/main/res/drawable/ic_baseline_check_24.xml

This file was deleted.

9 changes: 0 additions & 9 deletions android/src/main/res/drawable/ic_baseline_feedback_24.xml

This file was deleted.

10 changes: 0 additions & 10 deletions android/src/main/res/drawable/ic_baseline_person_24.xml

This file was deleted.

9 changes: 0 additions & 9 deletions android/src/main/res/drawable/ic_description_black_24dp.xml

This file was deleted.

9 changes: 0 additions & 9 deletions android/src/main/res/drawable/icon_company.xml

This file was deleted.

9 changes: 0 additions & 9 deletions android/src/main/res/drawable/icon_profile.xml

This file was deleted.

9 changes: 0 additions & 9 deletions android/src/main/res/drawable/icon_website.xml

This file was deleted.

9 changes: 0 additions & 9 deletions android/src/main/res/drawable/menu_info.xml

This file was deleted.

12 changes: 0 additions & 12 deletions android/src/main/res/drawable/menu_my_agenda.xml

This file was deleted.

9 changes: 0 additions & 9 deletions android/src/main/res/drawable/menu_schedule.xml

This file was deleted.

12 changes: 0 additions & 12 deletions android/src/main/res/drawable/menu_settings.xml

This file was deleted.

9 changes: 0 additions & 9 deletions android/src/main/res/drawable/menu_sponsor.xml

This file was deleted.

37 changes: 0 additions & 37 deletions android/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,43 +7,6 @@
<string name="notification_feedback_title">Feedback Time!</string>
<string name="notification_feedback_body">Your Feedback is Requested.</string>

<string name="schedule_title">Schedule</string>
<string name="droidcon_title">Droidcon London 2023</string>
<string name="schedule_session_detail_title">Session</string>
<string name="schedule_session_detail_status_future">This session hasn\'t started yet.</string>
<string name="schedule_session_detail_status_in_progress">This session is happening now.</string>
<string name="schedule_session_detail_status_past">This session has already ended.</string>
<string name="schedule_session_detail_status_conflict">This session conflicts with another session in your schedule.</string>
<string name="schedule_session_detail_is_attending_action_description">Do not attend</string>
<string name="schedule_session_detail_is_not_attending_action_description">Attend</string>
<string name="schedule_session_detail_info_description">Info</string>
<string name="schedule_session_detail_description_description">Description</string>
<string name="schedule_speaker_detail_title">Speaker</string>
<string name="schedule_speaker_detail_info_description">Info</string>
<string name="schedule_empty">There are no sessions planned.</string>
<string name="schedule_item_in_room">in %s</string>

<string name="my_agenda_title">My Agenda</string>
<string name="my_agenda_empty">You are not attending any sessions.</string>

<string name="sponsors_title">Sponsors</string>
<string name="sponsors_empty">Sponsors could not be loaded.</string>
<string name="sponsor_title">Sponsor</string>
<string name="sponsor_detail_description_description">Description</string>

<string name="settings_title">Settings</string>
<string name="settings_enable_feedback_title">Enable feedback</string>
<string name="settings_enable_reminders_title">Enable reminders</string>

<string name="feedback_title">What did you think of \"%s\"?</string>
<string name="feedback_opinion_placeholder">(Optional) Suggest improvements</string>
<string name="feedback_reaction_bad_description">Bad</string>
<string name="feedback_reaction_normal_description">Normal</string>
<string name="feedback_reaction_good_description">Good</string>
<string name="feedback_submit">Submit</string>
<string name="feedback_close_and_disable">Close and disable feedback</string>
<string name="feedback_skip">Skip feedback</string>

<string name="feedback_add_title">Add feedback</string>
<string name="feedback_change_title">Change your feedback</string>
</resources>
1 change: 0 additions & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ plugins {
alias(libs.plugins.ktlint)
alias(libs.plugins.serialization).apply(false)
alias(libs.plugins.cocoapods).apply(false)
alias(libs.plugins.skie).apply(false)
}

subprojects {
Expand Down
48 changes: 23 additions & 25 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,33 +5,31 @@ targetSdk = "34"
compileSdk = "34"

# Dependencies
kotlin = "1.9.22"
android-gradle-plugin = "8.2.1"
coroutines = "1.7.3"
kotlinx-datetime = "0.5.0"
ktor = "2.3.7"
kotlin = "2.0.0-Beta4"
android-gradle-plugin = "8.2.2"
coroutines = "1.8.0"
kotlinx-datetime = "0.6.0-RC.2"
ktor = "2.3.9"

stately = "2.0.5"
stately = "2.0.6"
java = "17"
kermit = "2.0.2"
skie = "0.6.1"
kermit = "2.0.3"
sqliter = "1.3.1"

hyperdrive = "0.1.148"

multiplatformSettings = "1.1.1"
sqlDelight = "2.0.1"
firebase-bom = "32.4.1"
firebase-bom = "32.7.4"
firebase-crashlytics-gradle = "2.9.9"
gms-google-services = "4.4.0"
gms-google-services = "4.4.1"

compose-main = "1.5.4"
compose-compiler = "1.5.8-dev-k1.9.22-42b6ec2b037"
composeNavigation = "2.7.6"
compose-jb = "1.6.0-dev1357"
compose-androidx-ui = "1.6.3"
compose-compiler = "1.5.11-dev-k2.0.0-Beta4-21f5e479a96"
composeNavigation = "2.7.7"
compose-jb = "1.6.1"

accompanistCoil = "0.15.0"
accompanistNavigationAnimation = "0.32.0"
accompanistNavigationAnimation = "0.34.0"
splashscreen = "1.0.1"
junit = "4.13.2"
junitKtx = "1.1.5"
Expand All @@ -40,19 +38,21 @@ korio = "4.0.10"

# Sample - Android
androidx-core = "1.12.0"
androidx-lifecycle = "2.6.2"
androidx-lifecycle = "2.7.0"
androidx-activity-compose = "1.8.2"
android-desugaring = "2.0.4"
koin = "3.5.3"
uuid = "0.8.2"
uuid = "0.8.3"
ktlint = "11.0.0"
coil = "3.0.0-alpha04"

[libraries]
coil-compose = { module = "io.coil-kt.coil3:coil-compose", version.ref = "coil" }
coil-network = { module = "io.coil-kt.coil3:coil-network-ktor", version.ref = "coil" }
sqliter = { module = "co.touchlab:sqliter-driver", version.ref = "sqliter" }
compose-compiler = { module = "androidx.compose.compiler:compiler", version.ref = "compose-compiler" }
androidx-core-splashscreen = { module = "androidx.core:core-splashscreen", version.ref = "splashscreen" }

accompanist-coil = { module = "com.google.accompanist:accompanist-coil", version.ref = "accompanistCoil" }
accompanist-navigationAnimation = { module = "com.google.accompanist:accompanist-navigation-animation", version.ref = "accompanistNavigationAnimation" }
firebase-bom = { module = "com.google.firebase:firebase-bom", version.ref = "firebase-bom" }
firebase-analytics = { module = "com.google.firebase:firebase-analytics-ktx", version = "_" }
Expand All @@ -61,7 +61,6 @@ hyperdrive-multiplatformx-api = { module = "org.brightify.hyperdrive:multiplatfo
android-desugar = { module = "com.android.tools:desugar_jdk_libs", version.ref = "android-desugaring" }
uuid = { module = "com.benasher44:uuid", version.ref = "uuid" }
korio = { module = "com.soywiz.korlibs.korio:korio", version.ref = "korio" }
kotlin-test-common = { module = "org.jetbrains.kotlin:kotlin-test-common", version.ref = "kotlin" }
test-junit = { module = "junit:junit", version.ref = "junit" }
test-junitKtx = { module = "androidx.test.ext:junit-ktx", version.ref = "junitKtx" }
test-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
Expand Down Expand Up @@ -98,10 +97,10 @@ androidx-lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime-kt
androidx-lifecycle-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle" }
androidx-lifecycle-compose = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "androidx-lifecycle" }

compose-ui = { module = "androidx.compose.ui:ui", version.ref = "compose-main" }
compose-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose-main" }
compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "compose-main" }
compose-material = { module = "androidx.compose.material:material", version.ref = "compose-main" }
compose-ui = { module = "androidx.compose.ui:ui", version.ref = "compose-androidx-ui" }
compose-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose-androidx-ui" }
compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "compose-androidx-ui" }
compose-material = { module = "androidx.compose.material:material", version.ref = "compose-androidx-ui" }
compose-activity = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity-compose" }
compose-navigation = { module = "androidx.navigation:navigation-compose", version.ref = "composeNavigation" }

Expand All @@ -119,7 +118,6 @@ jetbrains-compose = { id = "org.jetbrains.compose", version.ref = "compose-jb" }
ktlint = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "ktlint" }
serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
cocoapods = { id = "org.jetbrains.kotlin.native.cocoapods", version.ref = "kotlin" }
skie = { id = "co.touchlab.skie", version.ref = "skie" }

[bundles]
ktor-common = ["ktor-client-core", "ktor-client-logging", "ktor-client-serialization", "ktor-client-contentNegotiation"]
Expand Down
Loading
Loading