Skip to content
This repository has been archived by the owner on Feb 21, 2024. It is now read-only.

Commit

Permalink
Merge pull request #1 from LabShare/update
Browse files Browse the repository at this point in the history
update Labshare logs
  • Loading branch information
kyxyes authored Jul 7, 2021
2 parents fb01d58 + 38003ed commit b876906
Show file tree
Hide file tree
Showing 126 changed files with 1,870 additions and 572 deletions.
Binary file modified .DS_Store
Binary file not shown.
2 changes: 1 addition & 1 deletion AppInfo.swift
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import Foundation
class AppInfo {
let version: String
let build: String
let gitCommitSHA: String = "0d998cb"
let gitCommitSHA: String = "fb01d58"

init?() {
guard let version = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String,
Expand Down
1,275 changes: 1,275 additions & 0 deletions Labshare Auth.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1020"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "BB37DE501C7E08320016D422"
BuildableName = "Super Gluu.app"
BlueprintName = "Super Gluu"
ReferencedContainer = "container:Super Gluu.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</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"
showNonLocalizedStrings = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "BB37DE501C7E08320016D422"
BuildableName = "Super Gluu.app"
BlueprintName = "Super Gluu"
ReferencedContainer = "container:Super Gluu.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</LaunchAction>
<ProfileAction
buildConfiguration = "Testing"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "BB37DE501C7E08320016D422"
BuildableName = "Super Gluu.app"
BlueprintName = "Super Gluu"
ReferencedContainer = "container:Super Gluu.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Testing"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
112 changes: 112 additions & 0 deletions Labshare Auth.xcodeproj/xcshareddata/xcschemes/Super Gluu.xcscheme
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1020"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "BB37DE501C7E08320016D422"
BuildableName = "Super Gluu.app"
BlueprintName = "Super Gluu"
ReferencedContainer = "container:Super Gluu.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "BB37DE501C7E08320016D422"
BuildableName = "Super Gluu.app"
BlueprintName = "Super Gluu"
ReferencedContainer = "container:Super Gluu.xcodeproj">
</BuildableReference>
</MacroExpansion>
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "BB37DE6C1C7E08320016D422"
BuildableName = "Super Gluu.xctest"
BlueprintName = "Super GluuTests"
ReferencedContainer = "container:Super Gluu.xcodeproj">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "BB37DE771C7E08320016D422"
BuildableName = "Super Gluu.xctest"
BlueprintName = "Super GluuUITests"
ReferencedContainer = "container:Super Gluu.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = "en"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "BB37DE501C7E08320016D422"
BuildableName = "Super Gluu.app"
BlueprintName = "Super Gluu"
ReferencedContainer = "container:Super Gluu.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<LocationScenarioReference
identifier = "com.apple.dt.IDEFoundation.CurrentLocationScenarioIdentifier"
referenceType = "1">
</LocationScenarioReference>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "BB37DE501C7E08320016D422"
BuildableName = "Super Gluu.app"
BlueprintName = "Super Gluu"
ReferencedContainer = "container:Super Gluu.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
12 changes: 6 additions & 6 deletions Podfile
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@

# Uncomment this line to define a global platform for your project

platform :ios, '8.0'
platform :ios, '9.0'
source 'https://github.com/CocoaPods/Specs.git'
use_frameworks!

#target "Super Gluu" do
#target "Labshare Auth" do

def project_pods
pod 'AFNetworking', '~> 2.5'
pod 'AFNetworking', '~> 4.0'
pod 'NSHash', '~> 1.1.0'
pod 'Google-Mobile-Ads-SDK'
pod 'Google-Mobile-Ads-SDK', '~> 7.63.0'
pod 'SWTableViewCell', '~> 0.3.7'
pod 'SCLAlertView', :git => 'https://github.com/soulfoodz/SCLAlertView-Swift.git'
pod 'SwiftyStoreKit', '~> 0.11'
pod 'QRCodeReader.swift', '~> 9.0.1'

pod 'ox-push3', :git => 'https://github.com/GluuFederation/oxPush-iOS.git'
pod 'ox-push3', :git => 'https://github.com/LabShare/oxPush-iOS'

end

target 'Super Gluu' do
target 'Labshare Auth' do
project_pods
end

Expand Down
2 changes: 1 addition & 1 deletion Super Gluu.entitlements
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<string>development</string>
<key>keychain-access-groups</key>
<array>
<string>$(AppIdentifierPrefix)com.ios.gluu</string>
<string>$(AppIdentifierPrefix)com.ios.labshare.auth</string>
</array>
</dict>
</plist>
Binary file modified super-gluu/.DS_Store
Binary file not shown.
6 changes: 3 additions & 3 deletions super-gluu/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -201,14 +201,14 @@ class AppDelegate: UIResponder, UIApplicationDelegate {

guard let currentVersion = Int(noDotsVersion) else { return }

let badVersion = Int(3405)
let badVersion = Int(99)

if badVersion > currentVersion {

let alert = SCLAlertView(showCloseButton: true, horizontalButtons: false)

alert.showCustom("Please update Super Gluu",
subTitle: "There is a new version of Super Gluu available for download. Please update to prevent any issues.",
alert.showCustom("Please update Labshare Auth",
subTitle: "There is a new version of Labshare Auth available for download. Please update to prevent any issues.",
color: AppConfiguration.systemColor,
closeButtonTitle: LocalString.Ok.localized,
circleIconImage: AppConfiguration.systemAlertIcon,
Expand Down
Binary file modified super-gluu/Assets.xcassets/.DS_Store
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added super-gluu/Assets.xcassets/AppIcon.appiconset/16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit b876906

Please sign in to comment.