8000 Merge branch 'main' into feat/mobile-surveys-merge-main by ioannisj · Pull Request #313 · PostHog/posthog-ios · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Merge branch 'main' into feat/mobile-surveys-merge-main #313

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

Merged
merged 8 commits into from
Mar 5, 2025

Conversation

ioannisj
Copy link
Contributor
@ioannisj ioannisj commented Mar 5, 2025

💡 Motivation and Context

Just bringing over latest changes from main into this feature branch. A number of conflicts so worth a look

#skip-changelog

Conflicts:

  • CHANGELOG.md
  • Makefile
  • PostHog.podspec
  • PostHog.xcodeproj/project.pbxproj
  • PostHog/PostHogApi.swift
  • PostHog/PostHogSDK.swift
  • PostHog/PostHogVersion.swift
  • PostHogTests/PostHogFeatureFlagsTest.swift
  • PostHogTests/PostHogSessionManagerTest.swift
  • PostHogTests/TestUtils/MockApplicationLifecyclePublisher.swift
  • PostHogTests/TestUtils/TestPostHog.swift

💚 How did you test it?

📝 Checklist

  • I reviewed the submitted code.
  • I added tests to verify the changes.
  • I updated the docs if needed.
  • No breaking change or entry added to the changelog.

* fix: xcframework builds

* fix: import access level

* feat: add sample xcframework project

* fix: build examples

* chore: update CHANGELOG
* chore: skip creating a visionOS simulator if not needed

* fix: external sdk example
# Conflicts:
#	CHANGELOG.md
#	Makefile
#	PostHog.podspec
#	PostHog.xcodeproj/project.pbxproj
#	PostHog/PostHogApi.swift
#	PostHog/PostHogSDK.swift
#	PostHog/PostHogVersion.swift
#	PostHogTests/PostHogFeatureFlagsTest.swift
#	PostHogTests/PostHogSessionManagerTest.swift
#	PostHogTests/TestUtils/MockApplicationLifecyclePublisher.swift
#	PostHogTests/TestUtils/TestPostHog.swift
@ioannisj ioannisj requested a review from marandaneto as a code owner March 5, 2025 09:37
@ioannisj
Copy link
Contributor Author
ioannisj commented Mar 5, 2025

A test seems to be failing but runs greek locally. Will merge for now though and address this on next PR if it's still an issue

@ioannisj ioannisj merged commit 2685928 into feat/mobile-surveys Mar 5, 2025
5 of 6 checks passed
@ioannisj ioannisj deleted the feat/mobile-surveys-merge-main branch March 5, 2025 11:12
ioannisj added a commit that referenced this pull request Apr 9, 2025
* feat: load remote config and feature flags (#283)

* feat: load remote config and feature flags

* fix: cleanup

* fix: redundant assignment

* fix: hasFeatureFlags

* fix: lint

* feat: add survey domain models (#284)

* feat: add survey domain models

* fix: reuse date formatter

* fix: improve test fixtures and model consistency

* Merge branch 'main' into feat/mobile-surveys-merge-main (#313)

* chore: session replay ga (#286)

* fix: xcframework builds (#288)

* fix: xcframework builds

* fix: import access level

* feat: add sample xcframework project

* fix: build examples

* chore: update CHANGELOG

* Update version

* chore: skip creating a visionOS simulator if not needed (#289)

* chore: skip creating a visionOS simulator if not needed

* fix: external sdk example

* Update version

* feat: add survey domain models

* Merge branch 'main' into feat/mobile-surveys-merge-main

# Conflicts:
#	CHANGELOG.md
#	Makefile
#	PostHog.podspec
#	PostHog.xcodeproj/project.pbxproj
#	PostHog/PostHogApi.swift
#	PostHog/PostHogSDK.swift
#	PostHog/PostHogVersion.swift
#	PostHogTests/PostHogFeatureFlagsTest.swift
#	PostHogTests/PostHogSessionManagerTest.swift
#	PostHogTests/TestUtils/MockApplicationLifecyclePublisher.swift
#	PostHogTests/TestUtils/TestPostHog.swift

* fix: lint

* feat: add base survey integration (#314)

* feat: add survey domain models

* Merge branch 'main' into feat/mobile-surveys-merge-main

# Conflicts:
#	CHANGELOG.md
#	Makefile
#	PostHog.podspec
#	PostHog.xcodeproj/project.pbxproj
#	PostHog/PostHogApi.swift
#	PostHog/PostHogSDK.swift
#	PostHog/PostHogVersion.swift
#	PostHogTests/PostHogFeatureFlagsTest.swift
#	PostHogTests/PostHogSessionManagerTest.swift
#	PostHogTests/TestUtils/MockApplicationLifecyclePublisher.swift
#	PostHogTests/TestUtils/TestPostHog.swift

* feat: base surveys integration

* feat: base survey display

* fix: builds

* fix: test

* fix: tests

* fix: remote config tests

* feat: add survey UI and display logic (#320)

* feat: add survey domain models

* Merge branch 'main' into feat/mobile-surveys-merge-main

# Conflicts:
#	CHANGELOG.md
#	Makefile
#	PostHog.podspec
#	PostHog.xcodeproj/project.pbxproj
#	PostHog/PostHogApi.swift
#	PostHog/PostHogSDK.swift
#	PostHog/PostHogVersion.swift
#	PostHogTests/PostHogFeatureFlagsTest.swift
#	PostHogTests/PostHogSessionManagerTest.swift
#	PostHogTests/TestUtils/MockApplicationLifecyclePublisher.swift
#	PostHogTests/TestUtils/TestPostHog.swift

* feat: base surveys integration

* feat: base survey display

* fix: builds

* fix: test

* fix: tests

* fix: remote config tests

* feat: add survey ui components

* feat: survey question type display and next question logic

* feat: send survey seen, sent, dismissed events

* feat: add event-activated surveys

* fix: empty question description

* fix: hit test on iOS 18

* fix: safe area inset

* refactor: move display related to logic to display manager

* fix: handle case displayThankYouMessage is false

* fix: tests

* fix: handle optional questions

* fix: build

* feat: public api

* chore: update CHANGELOG

* feat: iOS15 presentation detents (#324)

* feat: add survey domain models

* Merge branch 'main' into feat/mobile-surveys-merge-main

# Conflicts:
#	CHANGELOG.md
#	Makefile
#	PostHog.podspec
#	PostHog.xcodeproj/project.pbxproj
#	PostHog/PostHogApi.swift
#	PostHog/PostHogSDK.swift
#	PostHog/PostHogVersion.swift
#	PostHogTests/PostHogFeatureFlagsTest.swift
#	PostHogTests/PostHogSessionManagerTest.swift
#	PostHogTests/TestUtils/MockApplicationLifecyclePublisher.swift
#	PostHogTests/TestUtils/TestPostHog.swift

* feat: base surveys integration

* feat: base survey display

* fix: builds

* fix: test

* fix: tests

* fix: remote config tests

* feat: add survey ui components

* feat: survey question type display and next question logic

* feat: send survey seen, sent, dismissed events

* feat: add event-activated surveys

* fix: empty question description

* fix: hit test on iOS 18

* fix: safe area inset

* refactor: move display related to logic to display manager

* fix: handle case displayThankYouMessage is false

* fix: tests

* feat: add backport for iOS 15 presentation detents

* fix: lint

* fix: sheet height

* fix: remove ViewBuilder attribute

* feat: add configuration option for remoteConfig

* chore: prefix survey models

* fix: cache needed integrations in sdk instance

* chore: split survey models to multiple files

* chore: refactor remote config callback
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants
0