Skip to content
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
15 changes: 5 additions & 10 deletions .github/workflows/ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ on:
- '**'
paths-ignore:
- '**.md'
- '**.yml'
pull_request:
branches:
- master
Expand Down Expand Up @@ -42,22 +41,18 @@ jobs:
xcode-version: latest-stable
- name: Install iOS
run: xcodebuild -downloadPlatform iOS
- name: Set Default Scheme
working-directory: ./iosApp
run: |
scheme_list=$(xcodebuild -list -json | tr -d "\n")
default=$(echo $scheme_list | ruby -e "require 'json'; puts JSON.parse(STDIN.gets)['project']['targets'][0]")
echo $default | cat >default
echo Using default scheme: $default
- name: Install XcodeGen
run: brew install xcodegen
- name: Generate Xcode project
run: xcodegen generate --spec iosApp/project.yml
- name: Build
working-directory: ./iosApp
env:
scheme: ${{ 'default' }}
scheme: Flare
platform: ${{ 'iOS Simulator' }}
run: |
# xcrun xctrace returns via stderr, not the expected stdout (see https://developer.apple.com/forums/thread/663959)
device=`xcrun xctrace list devices 2>&1 | grep -oE 'iPhone.*?[^\(]+' | head -1 | awk '{$1=$1;print}' | sed -e "s/ Simulator$//"`
if [ $scheme = default ]; then scheme=$(cat default); fi
if [ "`ls -A | grep -i \\.xcworkspace\$`" ]; then filetype_parameter="workspace" && file_to_build="`ls -A | grep -i \\.xcworkspace\$`"; else filetype_parameter="project" && file_to_build="`ls -A | grep -i \\.xcodeproj\$`"; fi
file_to_build=`echo $file_to_build | awk '{$1=$1;print}'`
xcodebuild build-for-testing -scheme "$scheme" -"$filetype_parameter" "$file_to_build" -destination "platform=$platform,name=iPhone 17" -skipPackagePluginValidation -skipMacroValidation
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ iosApp/Podfile.lock
iosApp/Pods/*
iosApp/Flare.xcworkspace/*
iosApp/Flare.xcodeproj/*
!iosApp/Flare.xcodeproj/project.pbxproj
shared/shared.podspec
.kotlin
.history
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ Here're some features we're planning to implement in the future.
### iOS
- Make sure you have JDK 25 installed
- Make sure you have a Mac with Xcode 26 installed
- Install XcodeGen with `brew install xcodegen`
- Run `xcodegen generate --spec iosApp/project.yml`
- open `iosApp/Flare.xcodeproj` in Xcode
- Build and run the app

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ private data class ThemedIconTheme(
val light: ThemedIconColors,
)

@ConsistentCopyVisibility
internal data class ThemeIconData private constructor(
private val theme: ThemedIconTheme,
) {
Expand Down
2 changes: 1 addition & 1 deletion desktopApp/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ plugins {
alias(libs.plugins.kotlin.serialization)
alias(libs.plugins.koin.compiler)
alias(libs.plugins.nucleus)
id("com.github.gmazzo.buildconfig") version "6.0.9"
id("com.github.gmazzo.buildconfig") version "6.0.10"
}

dependencies {
Expand Down
22 changes: 11 additions & 11 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ core-ktx = "1.19.0"
junit = "4.13.2"
androidx-test-ext-junit = "1.3.0"
espresso-core = "3.7.0"
lifecycle-runtime-ktx = "2.10.0"
lifecycle-runtime-ktx = "2.11.0"
activity-compose = "1.13.0"
compose-bom = "2026.05.01"
compose-bom = "2026.06.00"
ksp = "2.3.9"
koog = "1.0.0"
nucleus = "1.15.7"
Expand All @@ -35,7 +35,7 @@ prettytime = "5.0.9.Final"
readability = "1.0.0"
reorderable = "3.1.0"
richtextUiMaterial3 = "1.0.0-alpha05"
sentry = "8.43.2"
sentry = "8.44.0"
twitter-parser = "0.5.9"
molecule = "2.2.0"
accompanist = "0.37.3"
Expand All @@ -49,18 +49,18 @@ ksoup = "0.2.6"
versionUpdate = "0.54.0"
bluesky = "0.3.4-SNAPSHOT"
kotlinx-coroutines = "1.11.0"
koin = "4.2.1"
koin = "4.2.2"
koin-plugin = "1.0.1"
composeIcons = "1.3.0"
media3 = "1.10.1"
desugar_jdk_libs = "2.1.5"
datastore = "1.3.0-alpha09"
firebase-bom = "34.14.1"
google-services = "4.4.4"
firebase-bom = "34.15.0"
google-services = "4.5.0"
firebase-crashlytics = "3.0.7"
materialKolor = "4.1.1"
room = "3.0.0-alpha06"
sqlite = "2.7.0-alpha06"
room = "3.0.0-rc01"
sqlite = "2.7.0-rc01"
compose-multiplatform = "1.11.1"
navigation3 = "1.2.0-alpha04"
zoomable = "0.19.0"
Expand Down Expand Up @@ -112,7 +112,7 @@ ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" }
material3 = { group = "androidx.compose.material3", name = "material3", version = "1.5.0-alpha21" }
material3 = { group = "androidx.compose.material3", name = "material3", version = "1.5.0-alpha22" }
material3WindowSizeClass = { group = "androidx.compose.material3", name = "material3-window-size-class" }
material3-adaptive-navigation-suite = { group = "androidx.compose.material3", name = "material3-adaptive-navigation-suite" }
material3-adaptive = { group = "androidx.compose.material3.adaptive", name = "adaptive" }
Expand Down Expand Up @@ -230,8 +230,8 @@ qrose = { module = "io.github.alexzhirkevich:qrose", version.ref = "qrose" }

androidx-navigation3-runtime = { module = "androidx.navigation3:navigation3-runtime", version.ref = "navigation3" }
androidx-navigation3-ui = { module = "androidx.navigation3:navigation3-ui", version.ref = "navigation3" }
androidx-material3-adaptive-navigation3 = { group = "androidx.compose.material3.adaptive", name = "adaptive-navigation3", version = "1.3.0-beta02" }
androidx-lifecycle-viewmodel-navigation3 = { module = "androidx.lifecycle:lifecycle-viewmodel-navigation3", version = "2.10.0" }
androidx-material3-adaptive-navigation3 = { group = "androidx.compose.material3.adaptive", name = "adaptive-navigation3", version = "1.3.0-rc01" }
androidx-lifecycle-viewmodel-navigation3 = { module = "androidx.lifecycle:lifecycle-viewmodel-navigation3", version = "2.11.0" }

cupertino = { group = "io.github.schott12521", name = "cupertino", version.ref = "cupertino" }
robolectric = { module = "org.robolectric:robolectric", version.ref = "robolectric" }
Expand Down
Loading
Loading