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.

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

Add watchOS App #179

Merged
merged 9 commits into from
Sep 29, 2023
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
5 changes: 2 additions & 3 deletions .github/workflows/beta-deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,9 @@ jobs:
iosapptestflightdeployment:
name: iOS App TestFlight Deployment
needs: buildandtest
uses: CS342/.github/.github/workflows/xcodebuild-or-fastlane.yml@v1
uses: CS342/.github/.github/workflows/xcodebuild-or-fastlane.yml@v2
secrets: inherit
with:
artifactname: Balance.xcresult
runsonlabels: '["macos-latest"]'
fastlanelane: beta
setupsigning: true
setupsigning: true
3 changes: 1 addition & 2 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,9 @@ jobs:
uses: StanfordBDHG/.github/.github/workflows/swiftlint.yml@v2
buildandtest:
name: Build and Test
uses: CS342/.github/.github/workflows/xcodebuild-or-fastlane.yml@v1
uses: CS342/.github/.github/workflows/xcodebuild-or-fastlane.yml@v2
with:
artifactname: Balance.xcresult
runsonlabels: '["macos-latest"]'
setupfirebaseemulator: true
customcommand: "firebase emulators:exec 'fastlane test'"
uploadcoveragereport:
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
# Swift Package Manager
*.xcodeproj
.swiftpm
.build/
.build
.derivedData
!Balance.xcodeproj

# IDE related folders
Expand Down
321 changes: 188 additions & 133 deletions Balance.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/firebase/firebase-ios-sdk.git",
"state" : {
"revision" : "2bfe6abe1014aafe5cf28401708f7d39f9926a76",
"version" : "10.14.0"
"revision" : "8a8ec57a272e0d31480fb0893dda0cf4f769b57e",
"version" : "10.15.0"
}
},
{
Expand Down Expand Up @@ -140,8 +140,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/StanfordBDHG/ResearchKit",
"state" : {
"revision" : "d66e17369cfa238179db8ab65285fe6e7fa3e3c8",
"version" : "2.2.12"
"revision" : "9530fadc9d09c0b783388c752b0dbe841974b6af",
"version" : "2.2.18"
}
},
{
Expand All @@ -158,8 +158,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-protobuf.git",
"state" : {
"revision" : "cf62cdaea48b77f1a631e5cb3aeda6047c2cba1d",
"version" : "1.23.0"
"revision" : "3c54ab05249f59f2c6641dd2920b8358ea9ed127",
"version" : "1.24.0"
}
},
{
Expand Down
120 changes: 0 additions & 120 deletions Balance.xcodeproj/xcshareddata/xcschemes/Balance.xcscheme

This file was deleted.

11 changes: 11 additions & 0 deletions BalanceWatchApp/Assets.xcassets/AccentColor.colorset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"colors" : [
{
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions BalanceWatchApp/Assets.xcassets/AppIcon.appiconset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"images" : [
{
"filename" : "AppIcon.png",
"idiom" : "universal",
"platform" : "watchos",
"size" : "1024x1024"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
6 changes: 6 additions & 0 deletions BalanceWatchApp/Assets.xcassets/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
17 changes: 17 additions & 0 deletions BalanceWatchApp/BalanceWatchAppApp.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
//
// BalanceWatchAppApp.swift
// BalanceWatchApp Watch App
//
// Created by Paul Shmiedmayer on 9/27/23.
//

import SwiftUI

@main
struct BalanceWatchApp: App {
var body: some Scene {
WindowGroup {
ContentView()
}
}
}
25 changes: 25 additions & 0 deletions BalanceWatchApp/ContentView.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
//
// ContentView.swift
// BalanceWatchApp Watch App
//
// Created by Paul Shmiedmayer on 9/27/23.
//

import SwiftUI

struct ContentView: View {
var body: some View {
VStack {
Image(systemName: "globe")
.accessibilityHidden(true)
.imageScale(.large)
.foregroundStyle(.tint)
Text("Hello, world!")
}
.padding()
}
}

#Preview {
ContentView()
}
2 changes: 1 addition & 1 deletion fastlane/Appfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This source file is part of the CS342 2023 Balance Team Application project
# This source file is part of the StanfordBDHG Template Application project
#
# SPDX-FileCopyrightText: 2023 Stanford University
#
Expand Down
32 changes: 26 additions & 6 deletions fastlane/Fastfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,15 @@ platform :ios do
desc "Build and test"
lane :test do
run_tests(
code_coverage: true,
skip_build: true,
derived_data_path: ".derivedData",
code_coverage: true,
devices: ["iPhone 15 Pro"],
force_quit_simulator: true,
reset_simulator: true,
prelaunch_simulator: false,
concurrent_workers: 1,
max_concurrent_simulators: 1,
result_bundle: true,
output_directory: "."
)
Expand All @@ -27,7 +34,19 @@ platform :ios do
desc "Build app"
lane :build do
build_app(
derived_data_path: ".derivedData"
derived_data_path: ".derivedData",
output_directory: ".build",
archive_path: ".build/Balance.xcarchive",
configuration: "Release",
export_options: {
method: "app-store",
signingStyle: "manual",
signingCertificate: "Apple Distribution: Paul Schmiedmayer (637867499T)",
provisioningProfiles: {
"edu.stanford.cs342.2023.balance" => "CS342 2023 Balance Team Application",
"edu.stanford.cs342.2023.balance.watchApp" => "CS342 2023 Balance Team Watch Application"
}
}
)
end

Expand All @@ -44,10 +63,11 @@ platform :ios do
desc "Publish a beta release to internal TestFlight testers"
lane :beta do
signin
increment_build_number({
build_number: latest_testflight_build_number + 1,
xcodeproj: "Balance.xcodeproj"
})
increment_build_number(
{
build_number: latest_testflight_build_number + 1
}
)
build
commit = last_git_commit
upload_to_testflight(
Expand Down
25 changes: 0 additions & 25 deletions fastlane/Gymfile

This file was deleted.

18 changes: 0 additions & 18 deletions fastlane/Scanfile

This file was deleted.