Merge branch 'develop' into 'master'

New release 2.0.0

See merge request frontend/ios-sdk!31

Author: Николай Капустин

.github/workflows/main.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   build:
-    runs-on: macOS-11
+    runs-on: macOS-latest
     steps:
       - uses: actions/checkout@v1
       - name: Install Cocoapods
@@ -17,6 +17,6 @@ jobs:
           export LIB_VERSION=$(git describe --tags `git rev-list --tags --max-count=1`)
           set -eo pipefail
           pod lib lint --allow-warnings
-          pod trunk push OgonRuSDK.podspec --allow-warnings
+          pod trunk push GPBonusSDK.podspec --allow-warnings
         env:
           COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }}

.gitignore

@@ -3,6 +3,27 @@ derived_data
 .idea
 
 # CocoaPods
-Pods
+Pods/
 
 .DS_Store
+
+.DS_Store
+.vscode/
+
+build/
+*.ipa
+*.app.dSym.zip
+*.xcarchive
+
+*.log
+
+*.xcworkspace
+*.xcworkspace/*
+*.xcuserstate
+
+.swiftpm/config/registries.json
+.swiftpm/xcode/xcuserdata
+.swiftpm/xcode/package.xcworkspace
+.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
+
+.netrc

GPBonusSDK.podspec

@@ -0,0 +1,15 @@
+Pod::Spec.new do |spec|
+  spec.name         = "GPBonusSDK"
+  spec.version      = ENV['LIB_VERSION'] || "2.0.0"
+  spec.summary      = "GazpromBonus widget integration lib"
+  spec.homepage     = "https://github.com/SetPartnerstv/ios-sdk"
+  spec.license      = { :type => "MIT", :file => "LICENSE" }
+  spec.author       = "SetPartnerstv"
+  spec.platform     = :ios, "11.0"
+  spec.source       = { :git => "https://github.com/SetPartnerstv/ios-sdk.git", :tag => "#{spec.version}" }
+  spec.source_files = "sdk/**/*.{swift,h,m}"
+  spec.requires_arc = true
+  spec.swift_version = "5.0"
+  spec.dependency "SwiftProtobuf", "~> 1.14.0"
+  spec.frameworks = ["UIKit", "WebKit"]
+end

OgonRuSDK.podspec

@@ -0,0 +1,29 @@
+// swift-tools-version: 5.8
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "GPBonusSDK",
+    platforms: [.iOS(.v12)],
+    products: [
+        // Products define the executables and libraries a package produces, and make them visible to other packages.
+        .library(
+            name: "GPBonusSDK",
+            targets: ["GPBonusSDK"]),
+    ],
+    dependencies: [
+        // Dependencies declare other packages that this package depends on.
+        .package(url: "https://github.com/apple/swift-protobuf.git", from: "1.6.0")
+    ],
+    targets: [
+        // Targets are the basic building blocks of a package. A target can define a module or a test suite.
+        // Targets can depend on other targets in this package, and on products in packages this package depends on.
+        .target(
+            name: "GPBonusSDK",
+            dependencies: [.product(name: "SwiftProtobuf", package: "swift-protobuf")],
+            path: "sdk/"
+            //exclude:["Podfile", "Podfile.lock"]
+        )
+    ]
+)

Package.resolved

@@ -1,5 +1,5 @@
 # Uncomment the next line to define a global platform for your project
-platform :ios, '11.0'
+platform :ios, '12.0'
 
 target 'sdk' do
   # Comment the next line if you don't want to use dynamic frameworks

Package.swift

@@ -13,4 +13,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 83673be9a8bf482e1b93951c70e677a0e1acfb8e
 
-COCOAPODS: 1.11.2
+COCOAPODS: 1.12.1

Podfile

@@ -1,6 +1,6 @@
 ## Описание проекта
 
-Библиотека интеграции виджета с WebView для использования в приложениях партнеров и собственном приложении "Огонь".
+Библиотека интеграции виджета с WebView для использования в приложениях партнеров и собственном приложении "Газпром Бонус".
 
 
 ## Установка зависимостей
@@ -10,12 +10,5 @@
 * установить зависимости из CocoaPods: `pod install`
 
 
-## Сборка
-
-Universal build:
-
-```sh
-sh build.sh
-```
-
-Артефакты сборки лежат в папке `/build/universal`
+## Cocoapods
+Репозиторий синхронизуется с [GitHub](https://github.com/SetPartnerstv/ios-sdk) и публикуется в Cocoapods, название пакета `GPBonusSDK`.