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.

Sign up for GitHub

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

Jump to bottom

fix some classes not autocompleting in Swift, updated template with Swift Appdelegates #1351

Open
wants to merge 31 commits into
base: develop
Choose a base branch
from
Open

fix some classes not autocompleting in Swift, updated template with Swift Appdelegates #1351

wants to merge 31 commits into from

Conversation

LearnCocos2D
Copy link
Contributor

  • all CC classes now autocomplete (only exceptions: CCAppDelegate, CCMetalView)
  • "Source" group now properly points to the Source folder
  • Swift versions of AppDelegate with accompanying CCBProjectCreator update
  • Fixes to Mac targets (did not shut down when window closed, spammed log with GL errors on shutdown)

@LearnCocos2D LearnCocos2D changed the title fix some classes not autocompleting in Swift, updated template fix some classes not autocompleting in Swift, updated template with Swift Appdelegates Feb 12, 2015
@rkachowski
Copy link
Contributor

Can you bring this up to date with the latest develop? I'd have no problem merging it

@LearnCocos2D
Copy link
Contributor Author

I pulled latest apportable/develop, merged, pushed to my repo, and don't get any conflicts. Still git tells me it can't be merged automatically. How do I find out what the problem is?

@LearnCocos2D LearnCocos2D mentioned this pull request Mar 3, 2015
Closed
@LearnCocos2D
Copy link
Contributor Author

Test failure is more likely due to the test itself, it tries to build SB for iPhone 6?

xcodebuild: error: The run destination iPhone 6 is not valid for Running the scheme 'SpriteBuilder'.
    SpriteBuilder.app doesn't have any SDKs to build for iPhone 6. You can change SpriteBuilder.app's Base SDK or Supported Platforms to support iPhone 6.

@rkachowski
Copy link
Contributor

You can ignore the test failure, that's just circleci failing to run the appropriate target. I'll look at what the problem is with the merge

@rkachowski
Copy link
Contributor

The merge conflicts appear to be mostly in the project template. If you try to rebase this branch onto origin/develop you will encounter these problems directly.

@LearnCocos2D
Copy link
Contributor Author

Ah, now I see it. I had to rebase directly from origin rather than my local develop branch.

So I merged the changes, ran build_distribution, launched SB to create both objc & swift projects and tested both on all three platforms (android builds currently don't work due to plugin but they don't throw any errors in the app's code itself, so that's good).

Looks like we're good to go here, right?

@LearnCocos2D
Copy link
Contributor Author

darn, need to rebase again apparently ...

@LearnCocos2D
Copy link
Contributor Author

Okay, don't merge this. Still trying to figure out what the hell is going wrong here. I'm in like an endless loop of rebasing here to the point where it seems more straightforwar to just pull latest, then manually re-applying the changes ...

@LearnCocos2D
Copy link
Contributor Author

Okay, I created a new pull request (#1414) on a supposedly "clean" branch.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@LearnCocos2D @rkachowski