Skip to content

Commit

Permalink
After release changes
Browse files Browse the repository at this point in the history
  • Loading branch information
rleojoseph committed Aug 2, 2023
1 parent 3e71eb1 commit 148651d
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 38 deletions.
19 changes: 0 additions & 19 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,6 @@ jobs:
- run:
name: Build Simulator
command: fastlane build_sim_ci
- run:
name: Execute Tests
command: fastlane ci
- persist_to_workspace:
root: .
paths:
Expand Down Expand Up @@ -135,13 +132,6 @@ jobs:
when: always
command: rm ../MiniApp-Secrets.xcconfig || true

release-candidate-merge-pr:
<<: *container_medium
steps:
- run:
name: PR for Candidate Merge to Master
command: fastlane candidate_pr

release-sdk:
<<: *container_medium
steps:
Expand Down Expand Up @@ -245,15 +235,6 @@ workflows:
ignore: /.*/
- generate-and-publish-documentation:
name: "Generate and Publish Doc"
requires:
- Release SDK
filters:
tags:
only: /^v.*/
branches:
ignore: /.*/
- release-candidate-merge-pr:
name: "PR for Candidate Merge to Master"
requires:
- Release SDK
filters:
Expand Down
12 changes: 12 additions & 0 deletions .github/workflows/candidate_pr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
name: Create Candidate Pull Request

on:
release:
types: [published]

jobs:
build:
runs-on: macos-latest
steps:
- name: Create PR
run: gh pr create -B candidate -H master --title 'Candidate PR after release ' --body 'Pull request to merge changes from Candidate to master after release'
3 changes: 1 addition & 2 deletions .github/workflows/fastlane.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build and Test using Fastlane
name: Build, Test and Upload report

on:
push:
Expand All @@ -25,7 +25,6 @@ jobs:
steps:
- name: Repository checkout
uses: actions/checkout@v2

- name: Setup ruby
uses: ruby/setup-ruby@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion MiniApp.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |miniapp|
miniapp.name = 'MiniApp'
miniapp.version = '5.3.1'
miniapp.version = '5.4.0'
miniapp.authors = "Rakuten Ecosystem Mobile"
miniapp.summary = "Rakuten's Mini App SDK"
miniapp.description = "This open-source library allows you to integrate Mini App ecosystem into your iOS applications. Mini App SDK also facilitates communication between a mini app and the host app via a message bridge."
Expand Down
4 changes: 2 additions & 2 deletions MiniAppCarthage/MiniApp/MiniApp.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1332,7 +1332,7 @@
"@executable_path/Frameworks",
);
MACH_O_TYPE = staticlib;
MARKETING_VERSION = 5.3.1;
MARKETING_VERSION = 5.4.0;
OTHER_LDFLAGS = "-ObjC";
PRODUCT_BUNDLE_IDENTIFIER = com.rakuten.tech.mobile.MiniApp;
PRODUCT_NAME = MiniApp;
Expand Down Expand Up @@ -1361,7 +1361,7 @@
"@executable_path/Frameworks",
);
MACH_O_TYPE = staticlib;
MARKETING_VERSION = 5.3.1;
MARKETING_VERSION = 5.4.0;
OTHER_LDFLAGS = "-ObjC";
PRODUCT_BUNDLE_IDENTIFIER = com.rakuten.tech.mobile.MiniApp;
PRODUCT_NAME = MiniApp;
Expand Down
2 changes: 1 addition & 1 deletion Sources/Classes/core/MiniApp.swift
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import UIKit

/// Mini App Public API methods
public class MiniApp: NSObject {
public static let version = "5.3.1"
public static let version = "5.4.0"
private static let shared = MiniApp()
private let realMiniApp = RealMiniApp()
public static var MAOrientationLock: UIInterfaceOrientationMask = []
Expand Down
2 changes: 1 addition & 1 deletion Tests/Unit/MiniAppScriptMessageHandlerTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -1106,7 +1106,7 @@ class MiniAppScriptMessageHandlerTests: QuickSpec {
return
}
let environmentInfo = ResponseDecoder.decode(decodeType: MAHostEnvironmentInfo.self, data: responseData)
expect(environmentInfo?.sdkVersion).toEventually(equal("5.3.1"))
expect(environmentInfo?.sdkVersion).toEventually(equal("5.4.0"))
expect(environmentInfo?.hostVersion).toEventually(equal(Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String))
expect(environmentInfo?.hostLocale).toEventually(equal("en-US"))
}
Expand Down
2 changes: 1 addition & 1 deletion USERGUIDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ To integrate MiniApp SDK into your Xcode project using Swift Package Manager, ad

```ruby
dependencies: [
.package(url: "https://github.com/rakutentech/ios-miniapp.git", .upToNextMajor(from: "5.3.1"))
.package(url: "https://github.com/rakutentech/ios-miniapp.git", .upToNextMajor(from: "5.4.0"))
]
```

Expand Down
11 changes: 0 additions & 11 deletions fastlane/Fastfile
Original file line number Diff line number Diff line change
Expand Up @@ -74,17 +74,6 @@ platform :ios do

end

desc "Create pull request for candidate branch"
lane :candidate_pr do |options|
create_pull_request(
repo: "rakutentech/ios-miniapp",
title: "Candidate",
head: "candidate", # optional, defaults to current branch name
base: "master", # optional, defaults to "master"
body: "This is the candidate merge after a successful SDK release" # optional
)
end

lane :create_release do |options|
Dir.chdir("..") do
sh("./scripts/build-framework.sh")
Expand Down

0 comments on commit 148651d

Please sign in to comment.