Resolve conflicts

.github/workflows/swift.yml

@@ -0,0 +1,25 @@
+name: Build
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  build:
+
+    runs-on: macos-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Select Xcode
+      run: sudo xcode-select -switch /Applications/Xcode_12.4.app
+    - name: Xcode version
+      run: /usr/bin/xcodebuild -version
+    - name: Build app
+      run: |
+        xcodebuild CODE_SIGNING_ALLOWED=NO -sdk iphoneos -workspace wulkanowy.xcworkspace \
+          -configuration Release -scheme wulkanowy \
+          -derivedDataPath DerivedData clean build
+

.gitignore

@@ -134,3 +134,5 @@ fastlane/report.xml
 fastlane/Preview.html
 fastlane/screenshots/**/.png
 fastlane/test_output
+
+*.DS_Store

README.md

@@ -1 +1,5 @@
-# wulkanowy-ios
+# Wulkanowy iOS
+🌋 iOSowy klient dziennika VULCAN UONET+ dla ucznia i rodzica 
+
+![GitHub Workflow Status](https://github.com/wulkanowy/wulkanowy-ios/workflows/Build/badge.svg)
+[![Discord](https://img.shields.io/discord/390889354199040011.svg?color=#33CD56)](https://discord.gg/vccAQBr)

wulkanowy.xcodeproj/project.pbxproj

@@ -39,7 +39,6 @@
 		F4C6D90A2544E17400F8903A /* LoginView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4C6D9092544E17400F8903A /* LoginView.swift */; };
 		F4C6D90C2544E17500F8903A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F4C6D90B2544E17500F8903A /* Assets.xcassets */; };
 		F4C6D90F2544E17500F8903A /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F4C6D90E2544E17500F8903A /* Preview Assets.xcassets */; };
-		F4C6D91A2544E17500F8903A /* wulkanowyTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4C6D9192544E17500F8903A /* wulkanowyTests.swift */; };
 		F4C6D9252544E17500F8903A /* wulkanowyUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4C6D9242544E17500F8903A /* wulkanowyUITests.swift */; };
 /* End PBXBuildFile section */
 
@@ -117,7 +116,6 @@
 		F4C6D90E2544E17500F8903A /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
 		F4C6D9102544E17500F8903A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		F4C6D9152544E17500F8903A /* wulkanowyTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = wulkanowyTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
-		F4C6D9192544E17500F8903A /* wulkanowyTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = wulkanowyTests.swift; sourceTree = "<group>"; };
 		F4C6D91B2544E17500F8903A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		F4C6D9202544E17500F8903A /* wulkanowyUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = wulkanowyUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		F4C6D9242544E17500F8903A /* wulkanowyUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = wulkanowyUITests.swift; sourceTree = "<group>"; };
@@ -294,7 +292,8 @@
 		F4C6D9182544E17500F8903A /* wulkanowyTests */ = {
 			isa = PBXGroup;
 			children = (
-				F4C6D9192544E17500F8903A /* wulkanowyTests.swift */,
+				5CB39736260D4BE200349B0D /* LinuxMain.swift */,
+				5CB39735260D4BE200349B0D /* wulkanowyTests */,
 				F4C6D91B2544E17500F8903A /* Info.plist */,
 			);
 			path = wulkanowyTests;
@@ -438,6 +437,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				5CB39737260D4BE200349B0D /* wulkanowyTests in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -486,7 +486,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				F4C6D91A2544E17500F8903A /* wulkanowyTests.swift in Sources */,
+				5CB39738260D4BE200349B0D /* LinuxMain.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

wulkanowy.xcodeproj/xcshareddata/xcschemes/wulkanowyTests.xcscheme

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1240"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "F4C6D9142544E17500F8903A"
+               BuildableName = "wulkanowyTests.xctest"
+               BlueprintName = "wulkanowyTests"
+               ReferencedContainer = "container:wulkanowy.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

wulkanowyTests/wulkanowyTests.swift

@@ -1,34 +0,0 @@
-//
-//  wulkanowyTests.swift
-//  wulkanowyTests
-//
-//  Created by Mikołaj on 25/10/2020.
-//
-
-import XCTest
-@testable import wulkanowy
-
-@available (iOS 14, macOS 11, watchOS 7, tvOS 14, *)
-class wulkanowyTests: XCTestCase {
-
-    override func setUpWithError() throws {
-        // Put setup code here. This method is called before the invocation of each test method in the class.
-    }
-
-    override func tearDownWithError() throws {
-        // Put teardown code here. This method is called after the invocation of each test method in the class.
-    }
-
-    func testExample() throws {
-        // This is an example of a functional test case.
-        // Use XCTAssert and related functions to verify your tests produce the correct results.
-    }
-
-    func testPerformanceExample() throws {
-        // This is an example of a performance test case.
-        self.measure {
-            // Put the code you want to measure the time of here.
-        }
-    }
-
-}