Skip to content

Commit 1f83150

Browse files
authored
Merge pull request #1641 from joreilly/dc_berlin_2025
Droidcon Berlin 2025
2 parents c101ad3 + 18ac291 commit 1f83150

File tree

4 files changed

+19
-2
lines changed
  • .github/workflows
  • backend
    • datastore/src/jvmMain/kotlin/dev/johnoreilly/confetti/backend/datastore
    • service-import/src/jvmMain/kotlin/dev/johnoreilly/confetti/backend/import

4 files changed

+19
-2
lines changed

.github/workflows/ios.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,13 @@ jobs:
4545
restore-keys: |
4646
${{ runner.os }}-pods-
4747
48+
- name: Set Xcode Version 16.4
49+
shell: bash
50+
run: |
51+
xcodes select 16.4
52+
4853
- name: Build iOS app
49-
run: xcodebuild -allowProvisioningUpdates -project iosApp/iosApp.xcodeproj -configuration Debug -scheme iosApp -sdk iphoneos -destination name='iPhone 15'
54+
run: xcodebuild -allowProvisioningUpdates -project iosApp/iosApp.xcodeproj -configuration Debug -scheme iosApp -sdk iphoneos -destination name='iPhone 16 Pro'
5055

5156
- name: Run iOS unit tests
52-
run: xcodebuild -allowProvisioningUpdates -project iosApp/iosApp.xcodeproj -configuration Debug -scheme iosApp -sdk iphoneos -destination name='iPhone 15' test -test-timeouts-enabled YES
57+
run: xcodebuild -allowProvisioningUpdates -project iosApp/iosApp.xcodeproj -configuration Debug -scheme iosApp -sdk iphoneos -destination name='iPhone 16 Pro' test -test-timeouts-enabled YES

backend/datastore/src/jvmMain/kotlin/dev/johnoreilly/confetti/backend/datastore/ConferenceId.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ enum class ConferenceId(val id: String) {
3434
AndroidMakers2024("androidmakers2024"),
3535
KotlinConf2024("kotlinconf2024"),
3636
DroidconBerlin2024("droidconberlin2024"),
37+
DroidconBerlin2025("droidconberlin2025"),
3738
DevFestLille2024("devfestlille2024"),
3839
DroidConLisbon2024("droidconlisbon2024"),
3940
DroidConLondon2024("droidconlondon2024"),

backend/service-import/src/jvmMain/kotlin/dev/johnoreilly/confetti/backend/import/Main.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ private suspend fun update(conf: String?): Int {
136136
ConferenceId.AndroidMakers2024 -> Sessionize.importAndroidMakers2024()
137137
ConferenceId.KotlinConf2024 -> Sessionize.importKotlinConf2024()
138138
ConferenceId.DroidconBerlin2024 -> Sessionize.importDroidconBerlin2024()
139+
ConferenceId.DroidconBerlin2025 -> Sessionize.importDroidconBerlin2025()
139140
ConferenceId.DevFestLille2024 -> DevfestLille.import()
140141
ConferenceId.DroidConLisbon2024 -> importDroidconLisbon2024()
141142
ConferenceId.DroidConLondon2024 -> importDroidconLondon2024()

backend/service-import/src/jvmMain/kotlin/dev/johnoreilly/confetti/backend/import/Sessionize.kt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -406,6 +406,16 @@ object Sessionize {
406406
)
407407
}
408408

409+
suspend fun importDroidconBerlin2025(): Int {
410+
return importDroidconBerlin(
411+
ConferenceId.DroidconBerlin2024.id,
412+
"droidcon Berlin 2025",
413+
"https://sessionize.com/api/v2/ove96gci/view/All",
414+
"0xFFFFBE29"
415+
)
416+
}
417+
418+
409419
private val businessDesignCenter = DVenue(
410420
id = "main",
411421
name = "Business Design Center",

0 commit comments

Comments
 (0)