starred/Armchair-UrbanApps
1
0
Fork 0
mirror of https://github.com/UrbanApps/Armchair.git synced 2026-08-26 05:34:06 +02:00
Code Issues 36 Packages Projects Releases 3 Wiki Activity

[PR #86] [MERGED] Swift3 #118

New Issue
Closed
opened 2025-12-30 00:28:20 +01:00 by adam · 0 comments
adam commented 2025-12-30 00:28:20 +01:00
Owner
Copy Link
Copy Source

📋 Pull Request Information

Original PR: https://github.com/UrbanApps/Armchair/pull/86
Author: @apptekstudios
Created: 2/16/2017
Status: ✅ Merged
Merged: 2/24/2017
Merged by: @coneybeare

Base: master ← Head: swift3

📝 Commits (10+)

  • 556b57c Changed scopes and deprecated elements to compile in Swift 3
  • 0a73212 Working Migration to Swift 3
  • 9104458 Merge pull request #75 from kapellanos/master
  • b5270a4 fix swift 3 compile issue for mac os
  • d8bc619 Merge pull request #76 from phimage/swift3
  • bdcacff Update check for iOS Simulator
  • ffb40f4 Merge pull request #80 from OliverZiegler/swift3
  • 24b4f4a Merge branch 'master' into swift3
  • 61f124d Add custom dialog closure
  • 8384be5 Merge pull request #1 from whitepixelstudios/swift3

📊 Changes

3 files changed (+816 additions, -790 deletions)

View changed files

➕ .swift-version (+1 -0)
📝 Armchair.xcodeproj/project.pbxproj (+5 -3)
📝 Source/Armchair.swift (+810 -787)

📄 Description

Resolves conflicts for Swift3 merge - tested.

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/UrbanApps/Armchair/pull/86 **Author:** [@apptekstudios](https://github.com/apptekstudios) **Created:** 2/16/2017 **Status:** ✅ Merged **Merged:** 2/24/2017 **Merged by:** [@coneybeare](https://github.com/coneybeare) **Base:** `master` ← **Head:** `swift3` --- ### 📝 Commits (10+) - [`556b57c`](https://github.com/UrbanApps/Armchair/commit/556b57cabeacd19ca13e561f049fcef25868f1b4) Changed scopes and deprecated elements to compile in Swift 3 - [`0a73212`](https://github.com/UrbanApps/Armchair/commit/0a73212e72b84e11d61bcb41f9e2b2a7867165e8) Working Migration to Swift 3 - [`9104458`](https://github.com/UrbanApps/Armchair/commit/9104458f498322164f14f58459671a8cfa61fec0) Merge pull request #75 from kapellanos/master - [`b5270a4`](https://github.com/UrbanApps/Armchair/commit/b5270a4892de87e89d444f37df47d0366b8fb55e) fix swift 3 compile issue for mac os - [`d8bc619`](https://github.com/UrbanApps/Armchair/commit/d8bc619f3c549492437caa6bbe07534115146413) Merge pull request #76 from phimage/swift3 - [`bdcacff`](https://github.com/UrbanApps/Armchair/commit/bdcacffcb4e4b7a1e07e758cb05e30f224587a83) Update check for iOS Simulator - [`ffb40f4`](https://github.com/UrbanApps/Armchair/commit/ffb40f4d1480c3550c806bd64de71e977c5f52f9) Merge pull request #80 from OliverZiegler/swift3 - [`24b4f4a`](https://github.com/UrbanApps/Armchair/commit/24b4f4ab8fd91aadf403f278e9f7d4d748f6832f) Merge branch 'master' into swift3 - [`61f124d`](https://github.com/UrbanApps/Armchair/commit/61f124d82ca15b339994466ca7bb1d48b5522c50) Add custom dialog closure - [`8384be5`](https://github.com/UrbanApps/Armchair/commit/8384be5c1e05cc570fc5d00cc4d06fe14404b2a9) Merge pull request #1 from whitepixelstudios/swift3 ### 📊 Changes **3 files changed** (+816 additions, -790 deletions) <details> <summary>View changed files</summary> ➕ `.swift-version` (+1 -0) 📝 `Armchair.xcodeproj/project.pbxproj` (+5 -3) 📝 `Source/Armchair.swift` (+810 -787) </details> ### 📄 Description Resolves conflicts for Swift3 merge - tested. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
adam added the pull-request label 2025-12-30 00:28:20 +01:00
adam closed this issue 2025-12-30 00:28:20 +01:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
enhancement
pull-request
Mirrored from GitHub Pull Request
No labels pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No projects
Assignees
Clear assignees
adam (Adam Melkus)
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: starred/Armchair-UrbanApps#118