From 747ba53e7386776bf92c1c3a3ebaa59fa0281760 Mon Sep 17 00:00:00 2001 From: Max Muth Date: Thu, 23 Mar 2017 16:18:41 +0100 Subject: [PATCH 1/4] Create and fix build, use our Team ID for automatic signing --- TUM Campus App.xcodeproj/project.pbxproj | 10 +++++----- TUM Campus App/Info.plist | 8 +++++--- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/TUM Campus App.xcodeproj/project.pbxproj b/TUM Campus App.xcodeproj/project.pbxproj index 5f44213e..0d2fc33f 100644 --- a/TUM Campus App.xcodeproj/project.pbxproj +++ b/TUM Campus App.xcodeproj/project.pbxproj @@ -734,7 +734,7 @@ TargetAttributes = { 0E424F441BE16DBD00B5DFCB = { CreatedOnToolsVersion = 7.1; - DevelopmentTeam = ZGV2PY25EN; + DevelopmentTeam = LQ83GZ8GRK; LastSwiftMigration = 0820; }; 0E424F581BE16DBE00B5DFCB = { @@ -1115,7 +1115,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; - DEVELOPMENT_TEAM = ZGV2PY25EN; + DEVELOPMENT_TEAM = LQ83GZ8GRK; FRAMEWORK_SEARCH_PATHS = ( "$(SRCROOT)/Pods", "\"$PODS_CONFIGURATION_BUILD_DIR/ASWeekSelectorView\"", @@ -1134,7 +1134,7 @@ INFOPLIST_FILE = "TUM Campus App/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 10.2; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = "de.tum.in.www.Tum-Campus-App"; + PRODUCT_BUNDLE_IDENTIFIER = de.tum.campusapp; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "TUM Campus App/TUM Campus App-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -1150,11 +1150,11 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; - DEVELOPMENT_TEAM = ZGV2PY25EN; + DEVELOPMENT_TEAM = LQ83GZ8GRK; INFOPLIST_FILE = "TUM Campus App/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 10.2; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = "de.tum.in.www.Tum-Campus-App"; + PRODUCT_BUNDLE_IDENTIFIER = de.tum.campusapp; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "TUM Campus App/TUM Campus App-Bridging-Header.h"; SWIFT_VERSION = 3.0; diff --git a/TUM Campus App/Info.plist b/TUM Campus App/Info.plist index 79a2ac75..e830225e 100644 --- a/TUM Campus App/Info.plist +++ b/TUM Campus App/Info.plist @@ -2,8 +2,6 @@ - NSLocationWhenInUseUsageDescription - The TUM Campus app would like to use your location to Sort Cafeterias and other items. If not they will be in alphabetical order. CFBundleDevelopmentRegion en CFBundleExecutable @@ -21,7 +19,7 @@ CFBundleSignature ???? CFBundleVersion - 1 + 2 LSRequiresIPhoneOS NSAppTransportSecurity @@ -29,6 +27,10 @@ NSAllowsArbitraryLoads + NSCalendarsUsageDescription + The TUM Campus App cann add events to your calendar. + NSLocationWhenInUseUsageDescription + The TUM Campus App would like to use your location to Sort Cafeterias and other items. If not they will be in alphabetical order. UILaunchStoryboardName LaunchScreen UIMainStoryboardFile From e9e12b2d23a26ec0cac74dfdce033e7411ba30b9 Mon Sep 17 00:00:00 2001 From: Max Muth Date: Thu, 23 Mar 2017 16:19:01 +0100 Subject: [PATCH 2/4] Add fast lane deliver --- .gitignore | 2 ++ fastlane/metadata/copyright.txt | 1 + fastlane/metadata/de-DE/description.txt | 35 +++++++++++++++++++ fastlane/metadata/de-DE/keywords.txt | 1 + fastlane/metadata/de-DE/marketing_url.txt | 1 + fastlane/metadata/de-DE/name.txt | 1 + fastlane/metadata/de-DE/privacy_url.txt | 1 + fastlane/metadata/de-DE/release_notes.txt | 1 + fastlane/metadata/de-DE/support_url.txt | 1 + fastlane/metadata/primary_category.txt | 1 + .../metadata/primary_first_sub_category.txt | 1 + .../metadata/primary_second_sub_category.txt | 1 + fastlane/metadata/secondary_category.txt | 1 + .../metadata/secondary_first_sub_category.txt | 1 + .../secondary_second_sub_category.txt | 1 + 15 files changed, 50 insertions(+) create mode 100644 fastlane/metadata/copyright.txt create mode 100644 fastlane/metadata/de-DE/description.txt create mode 100644 fastlane/metadata/de-DE/keywords.txt create mode 100644 fastlane/metadata/de-DE/marketing_url.txt create mode 100644 fastlane/metadata/de-DE/name.txt create mode 100644 fastlane/metadata/de-DE/privacy_url.txt create mode 100644 fastlane/metadata/de-DE/release_notes.txt create mode 100644 fastlane/metadata/de-DE/support_url.txt create mode 100644 fastlane/metadata/primary_category.txt create mode 100644 fastlane/metadata/primary_first_sub_category.txt create mode 100644 fastlane/metadata/primary_second_sub_category.txt create mode 100644 fastlane/metadata/secondary_category.txt create mode 100644 fastlane/metadata/secondary_first_sub_category.txt create mode 100644 fastlane/metadata/secondary_second_sub_category.txt diff --git a/.gitignore b/.gitignore index c0a5e668..23d28e0f 100644 --- a/.gitignore +++ b/.gitignore @@ -52,6 +52,8 @@ Carthage/Build fastlane/report.xml fastlane/reports/ fastlane/screenshots +fastlane/Deliverfile # We don't want to store an individual users credentials here, so just run fastlane deliver init yourself. +Preview.html # Preview file by deliver .sonar # Code Injection diff --git a/fastlane/metadata/copyright.txt b/fastlane/metadata/copyright.txt new file mode 100644 index 00000000..f225c60c --- /dev/null +++ b/fastlane/metadata/copyright.txt @@ -0,0 +1 @@ +2017 exgen GbR diff --git a/fastlane/metadata/de-DE/description.txt b/fastlane/metadata/de-DE/description.txt new file mode 100644 index 00000000..6a3bbc5e --- /dev/null +++ b/fastlane/metadata/de-DE/description.txt @@ -0,0 +1,35 @@ +Die inoffizielle TUM Campus App (kein Support/Haftung durch die TU München) wird von Studierenden, freiwilligen Helfern und Lehrstuhlmitarbeitern entwickelt. Die App eignet sich sowohl zur Verwendung auf Smartphones, wie auch Tablets und bietet unter anderem folgende Funktionen: + +Persönliche Vorlesungstermine, Nachrichten der TUM und anderer Quellen, Veranstaltungshinweise, Mensa Speiseplan, MVV Abfahrtszeiten, Umgebungspläne und viele weiteren Informationen. + +Die App ist sowohl für Studierende, wie auch Mitarbeiter gedacht. + +Projektmanagement: +TUM - Fakultät für Informatik / F13 +Prof. Dr. Uwe Baumgarten +Kordian Bruck + +Derzeitige Entwickler (2017): +Mathias Quintero +Max Muth +Florian Gareis + + +Weitere Entwickler und involvierte Personen: +https://github.com/TCA-Team/iOS + +Support: https://www.facebook.com/TUMCampus +Für besondere Anliegen erreichen Sie uns auch via E-Mail unter "tca-support.os.in AT tum.de" + +Wichtiger Hinweis: +Dies ist keine offizielle App der Technischen Universität München. Es erfolgt daher auch kein offizieller Support oder eine Haftung. Die App wird von und für Studierende entwickelt. Die Benutzung erfolgt auf eigene Gefahr und eine Haftung ist ausgeschlossen. Aus Sicherheitsgründen wird der Zugriff auf private Daten in TUMonline über Tokens realisiert, die jeweils in TUMonline durch den Nutzer freigegeben und mit den jeweiligen Rechten versehen werden müssen. Für die Nutzung der neuen Chat-Funktionen gelten nachfolgende Bedingungen, denen Sie separat auch in der App zustimmen müssen. Mit der Installation der App akzeptieren Sie zudem die Erfassung diverser, technischer Daten. Weitere Hinweise finden Sie unten unter "Datenschutzerklärung". + +Datenschutzerklärung: https://tumcabe.in.tum.de/landing/privacy/ + +Lizenz: +GNU GPL v3 - http://www.gnu.org/licenses/gpl.html oder +New BSD License - http://www.opensource.org/licenses/bsd-license.php + +Der Quellcode kann hier bezogen werden: https://github.com/TCA-Team/ + +Wir suchen weiterhin Unterstützung! Bitte melden Sie sich unter: "tca-support.os.in AT tum.de" \ No newline at end of file diff --git a/fastlane/metadata/de-DE/keywords.txt b/fastlane/metadata/de-DE/keywords.txt new file mode 100644 index 00000000..966477d1 --- /dev/null +++ b/fastlane/metadata/de-DE/keywords.txt @@ -0,0 +1 @@ +TUM Campus App Guide Technische Universität München Room Finder Mensa \ No newline at end of file diff --git a/fastlane/metadata/de-DE/marketing_url.txt b/fastlane/metadata/de-DE/marketing_url.txt new file mode 100644 index 00000000..2d8c8f21 --- /dev/null +++ b/fastlane/metadata/de-DE/marketing_url.txt @@ -0,0 +1 @@ +https://tumcabe.in.tum.de/landing/ diff --git a/fastlane/metadata/de-DE/name.txt b/fastlane/metadata/de-DE/name.txt new file mode 100644 index 00000000..42180aeb --- /dev/null +++ b/fastlane/metadata/de-DE/name.txt @@ -0,0 +1 @@ +TUM Campus App diff --git a/fastlane/metadata/de-DE/privacy_url.txt b/fastlane/metadata/de-DE/privacy_url.txt new file mode 100644 index 00000000..067c75e1 --- /dev/null +++ b/fastlane/metadata/de-DE/privacy_url.txt @@ -0,0 +1 @@ +https://tumcabe.in.tum.de/landing/privacy/ diff --git a/fastlane/metadata/de-DE/release_notes.txt b/fastlane/metadata/de-DE/release_notes.txt new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/fastlane/metadata/de-DE/release_notes.txt @@ -0,0 +1 @@ + diff --git a/fastlane/metadata/de-DE/support_url.txt b/fastlane/metadata/de-DE/support_url.txt new file mode 100644 index 00000000..a10aed42 --- /dev/null +++ b/fastlane/metadata/de-DE/support_url.txt @@ -0,0 +1 @@ +https://tca.exgen.io/ diff --git a/fastlane/metadata/primary_category.txt b/fastlane/metadata/primary_category.txt new file mode 100644 index 00000000..5fa011db --- /dev/null +++ b/fastlane/metadata/primary_category.txt @@ -0,0 +1 @@ +MZGenre.Education diff --git a/fastlane/metadata/primary_first_sub_category.txt b/fastlane/metadata/primary_first_sub_category.txt new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/fastlane/metadata/primary_first_sub_category.txt @@ -0,0 +1 @@ + diff --git a/fastlane/metadata/primary_second_sub_category.txt b/fastlane/metadata/primary_second_sub_category.txt new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/fastlane/metadata/primary_second_sub_category.txt @@ -0,0 +1 @@ + diff --git a/fastlane/metadata/secondary_category.txt b/fastlane/metadata/secondary_category.txt new file mode 100644 index 00000000..2de96ca7 --- /dev/null +++ b/fastlane/metadata/secondary_category.txt @@ -0,0 +1 @@ +MZGenre.Utilities diff --git a/fastlane/metadata/secondary_first_sub_category.txt b/fastlane/metadata/secondary_first_sub_category.txt new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/fastlane/metadata/secondary_first_sub_category.txt @@ -0,0 +1 @@ + diff --git a/fastlane/metadata/secondary_second_sub_category.txt b/fastlane/metadata/secondary_second_sub_category.txt new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/fastlane/metadata/secondary_second_sub_category.txt @@ -0,0 +1 @@ + From 69f0b715bcd9211611265370c6682ce2488d6908 Mon Sep 17 00:00:00 2001 From: Max Muth Date: Thu, 23 Mar 2017 17:11:27 +0100 Subject: [PATCH 3/4] Updated description and fixed snapshot --- .../AutomatedScreenshots.swift | 10 +++++----- fastlane/Snapfile | 20 +++++++------------ fastlane/metadata/de-DE/description.txt | 3 +-- 3 files changed, 13 insertions(+), 20 deletions(-) diff --git a/AutomatedScreenshots/AutomatedScreenshots.swift b/AutomatedScreenshots/AutomatedScreenshots.swift index d8e564c9..58c2a341 100644 --- a/AutomatedScreenshots/AutomatedScreenshots.swift +++ b/AutomatedScreenshots/AutomatedScreenshots.swift @@ -34,11 +34,11 @@ class ScreenshotUITests: XCTestCase { app.navigationBars.buttons.element(boundBy: 0).tap() tablesQuery.staticTexts["My Lectures"].tap() snapshot("3_MyLectures") - app.navigationBars["My Lectures"].buttons["More"].tap() - tablesQuery.staticTexts["Room Finder"].tap() - app.navigationBars["Campus.SearchView"].textFields["Search"].typeText("hs1") - sleep(10) - snapshot("4_RoomFinderSearch") +// ToDo: RoomFinder: Wait for callback / results before doing screenshot +// app.navigationBars["My Lectures"].buttons["More"].tap() +// tablesQuery.staticTexts["Room Finder"].tap() +// app.navigationBars["Campus.SearchView"].textFields["Search"].typeText("hs1") +// snapshot("4_RoomFinderSearch") XCTAssert(true) } diff --git a/fastlane/Snapfile b/fastlane/Snapfile index 71c2180b..b83f65a8 100644 --- a/fastlane/Snapfile +++ b/fastlane/Snapfile @@ -1,26 +1,20 @@ devices([ - "iPhone 6", -# "iPhone 6 Plus", - # "iPhone 5", -# "iPad Pro (12.9 inch)", -# "iPad Pro (9.7 inch)", -# "Apple TV 1080p" + "iPhone 5", + "iPhone 6 Plus", +# "iPad Pro (12.9 inch)", +# "iPad Pro (9.7 inch)", ]) languages([ - "en-US", - # "de-DE", + "de-DE", + # "en-US", ]) -project "TUM Campus App.xcodeproj" +# project "TUM Campus App.xcodeproj" scheme "Screenshots" -# scheme "TUM Campus App" configuration "Debug" output_directory "fastlane/screenshots" derived_data_path "fastlane/DerivedData" clear_previous_screenshots true stop_after_first_error true - -# Arguments to pass to the app on launch. See https://github.com/fastlane/snapshot#launch-arguments -# launch_arguments(["-favColor red"]) \ No newline at end of file diff --git a/fastlane/metadata/de-DE/description.txt b/fastlane/metadata/de-DE/description.txt index 6a3bbc5e..48069fde 100644 --- a/fastlane/metadata/de-DE/description.txt +++ b/fastlane/metadata/de-DE/description.txt @@ -27,8 +27,7 @@ Dies ist keine offizielle App der Technischen Universität München. Es erfolgt Datenschutzerklärung: https://tumcabe.in.tum.de/landing/privacy/ Lizenz: -GNU GPL v3 - http://www.gnu.org/licenses/gpl.html oder -New BSD License - http://www.opensource.org/licenses/bsd-license.php +GNU GPL v3 - http://www.gnu.org/licenses/gpl.html Der Quellcode kann hier bezogen werden: https://github.com/TCA-Team/ From b8962bb784a7421373b2dd2b0eaedadbca354ff2 Mon Sep 17 00:00:00 2001 From: Max Muth Date: Thu, 23 Mar 2017 17:17:24 +0100 Subject: [PATCH 4/4] Add instructions for snapshot and deliver to README --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index e5549dc9..ee58c327 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,11 @@ You're welcome to contribute to this app! Just check it out and open PR's for yo - We have SonarQube to check the code quality at [https://sonarqube.com/dashboard?id=de.tum.in.www.Tum-Campus-App](https://sonarqube.com/dashboard?id=de.tum.in.www.Tum-Campus-App) - If a PR is coming from a branch from this repository (and not a fork), our [@TCA-Bot](https://travis-ci.org/TCA-Team/iOS) will review the changes automatically - Use [ci skip] in the commit message if you know there is no need to run a build on Travis + +## Publishing a new version - You can use _fastlane snapshot_ to automatically generate localized screenshots. If you want to add a view, just record a UI Test and add it to the AutomatedScreenshots.swift test +- App Store metadata is managed in the directory _fastlane/metadata/_. Go edit those and they'll be updated on the store with the next release +- Members of the Apple Developer Team of this app can run _fastlane deliver_ to update the metadata on iTunes Connect (run _fastlane deliver init_ first) ## Disclaimer: This is not an official app of the Technische Universität München. There's no support or warranty (you can however send us an email [tca-support.os.in@tum.de](mailto:tca-support.os.in@tum.de) or open an issue here on Github). The app is developed by students and for students, so use it at your own risk. We try to keep your data safe with only using TUMonline tokens and not saving your password. For further information you should have a look at our privacy policy and the terms and conditions of the lecture chat.