Bump pod version + clean code

BatchLabs · Jun 19, 2020 · 78f35f1 · 78f35f1
1 parent 54e7c75
commit 78f35f1
Show file tree

Hide file tree

Showing 11 changed files with 95 additions and 28 deletions.
diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
@@ -15,4 +15,5 @@ jobs:
         run: make ci
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
diff --git a/.gitignore b/.gitignore
@@ -12,7 +12,6 @@ build/
 *.perspectivev3
 !default.perspectivev3
 xcuserdata/
-xcshareddata/
 *.xccheckout
 profile
 *.moved-aside

diff --git a/BatchFirebaseDispatcher.podspec b/BatchFirebaseDispatcher.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'BatchFirebaseDispatcher'
-  s.version          = '1.0.0'
+  s.version          = '1.0.1'
   s.summary          = 'Batch.com Events Dispatcher Firebase implementation.'
 
   s.description      = <<-DESC

diff --git a/BatchFirebaseDispatcher.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/BatchFirebaseDispatcher.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/BatchFirebaseDispatcher.xcodeproj/xcshareddata/xcschemes/BatchFirebaseDispatcher.xcscheme b/BatchFirebaseDispatcher.xcodeproj/xcshareddata/xcschemes/BatchFirebaseDispatcher.xcscheme
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1130"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "51D530C72412553B009E7531"
+               BuildableName = "BatchFirebaseDispatcher.framework"
+               BlueprintName = "BatchFirebaseDispatcher"
+               ReferencedContainer = "container:BatchFirebaseDispatcher.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "625AA2F42424F4BB000DACC4"
+               BuildableName = "BatchFirebaseDispatcherTests.xctest"
+               BlueprintName = "BatchFirebaseDispatcherTests"
+               ReferencedContainer = "container:BatchFirebaseDispatcher.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">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "51D530C72412553B009E7531"
+            BuildableName = "BatchFirebaseDispatcher.framework"
+            BlueprintName = "BatchFirebaseDispatcher"
+            ReferencedContainer = "container:BatchFirebaseDispatcher.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/BatchFirebaseDispatcherTests/BatchFirebaseDispatcherTests.m b/BatchFirebaseDispatcherTests/BatchFirebaseDispatcherTests.m
@@ -1,11 +1,3 @@
-//
-//  BatchFirebaseDispatcherTests.m
-//  Batch-Firebase-Dispatcher_Tests
-//
-//  Created by Elliot Gouy on 23/10/2019.
-//  Copyright © 2019 elliot. All rights reserved.
-//
-
 #import <Foundation/Foundation.h>
 #import <XCTest/XCTest.h>
 #import <OCMock/OCMock.h>

diff --git a/BatchFirebaseDispatcherTests/BatchPayloadDispatcherTests.h b/BatchFirebaseDispatcherTests/BatchPayloadDispatcherTests.h
@@ -1,11 +1,3 @@
-//
-//  BatchPayloadDispatcherTests.h
-//  Batch-Firebase-Dispatcher_Tests
-//
-//  Created by Elliot Gouy on 23/10/2019.
-//  Copyright © 2019 elliot. All rights reserved.
-//
-
 #import <Batch/BatchEventDispatcher.h>
 
 @interface BatchPayloadDispatcherTest : NSObject <BatchEventDispatcherPayload>

diff --git a/BatchFirebaseDispatcherTests/BatchPayloadDispatcherTests.m b/BatchFirebaseDispatcherTests/BatchPayloadDispatcherTests.m
@@ -1,11 +1,3 @@
-//
-//  BatchPayloadDispatcherTests.m
-//  Batch-Firebase-Dispatcher_Tests
-//
-//  Created by Elliot Gouy on 23/10/2019.
-//  Copyright © 2019 elliot. All rights reserved.
-//
-
 #import <Foundation/Foundation.h>
 
 #import "BatchPayloadDispatcherTests.h"

diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,3 +1,3 @@
-binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAnalyticsBinary.json" "6.19.0"
+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAnalyticsBinary.json" "6.21.0"
 github "BatchLabs/ios-sdk" "1.15.0"
 github "erikdoe/ocmock" "v3.6"
diff --git a/Makefile b/Makefile
@@ -33,4 +33,7 @@ test-sonar: clean
 		-classpath $(CURDIR)/.sonar/sonar-scanner-cli-4.2.0.1873.jar \
 		org.sonarsource.scanner.cli.Main
 
-ci: test-sonar
+carthage:
+	carthage bootstrap --platform ios
+
+ci: carthage test-sonar
diff --git a/README.md b/README.md
@@ -1,4 +1,6 @@
 [![Cocoapods](https://img.shields.io/cocoapods/v/BatchFirebaseDispatcher)](https://cocoapods.org/pods/BatchFirebaseDispatcher)
+[![Github Action](https://github.com/BatchLabs/Batch-iOS-firebase-dispatcher/workflows/iOS%20CI/badge.svg)](https://github.com/BatchLabs/Batch-iOS-firebase-dispatcher/actions?query=workflow%3A%22iOS+CI%22)
+[![SonarCloud Coverage](https://sonarcloud.io/api/project_badges/measure?project=BatchLabs_Batch-iOS-firebase-dispatcher&metric=coverage)](https://sonarcloud.io/dashboard?id=BatchLabs_Batch-iOS-firebase-dispatcher)
 
 Batch.com iOS Firebase Event Dispatcher
 ==================