Skip to content

Commit 2480d6b

Browse files
authored
Merge pull request #197 from square/charmis/migration_travis_to_github_action
Charmis/migration travis to GitHub action
2 parents 5f170a5 + a00acce commit 2480d6b

File tree

12 files changed

+735
-24712
lines changed

12 files changed

+735
-24712
lines changed

.travis.yml

Lines changed: 0 additions & 70 deletions
This file was deleted.

react-native-in-app-payments-quickstart/android/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ dependencies {
217217
// Run this once to be able to run the application with BUCK
218218
// puts all compile dependencies into folder libs for BUCK to use
219219
task copyDownloadableDepsToLibs(type: Copy) {
220-
from configurations.compile
220+
from configurations.implementation
221221
into 'libs'
222222
}
223223

react-native-in-app-payments-quickstart/android/app/src/main/java/sqip/react/example/MainApplication.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import android.content.Context;
66
import com.facebook.react.PackageList;
77
import com.facebook.react.ReactApplication;
8+
import com.swmansion.gesturehandler.RNGestureHandlerPackage;
89
import com.facebook.react.ReactInstanceManager;
910
import com.facebook.react.ReactNativeHost;
1011
import com.facebook.react.ReactPackage;

react-native-in-app-payments-quickstart/android/build.gradle

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,15 @@ buildscript {
88
targetSdkVersion = 32
99
ndkVersion = "20.1.5948944"
1010
sqipVersion="1.5.6"
11-
kotlin_version = '1.4.10'
11+
kotlin_version = '1.7.10'
1212
}
1313
repositories {
1414
google()
1515
jcenter()
16+
mavenCentral()
1617
}
1718
dependencies {
18-
classpath('com.android.tools.build:gradle:4.2.2')
19+
classpath('com.android.tools.build:gradle:7.2.2')
1920
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
2021
// NOTE: Do not place your application dependencies here; they belong
2122
// in the individual module build.gradle files
@@ -24,6 +25,16 @@ buildscript {
2425

2526
allprojects {
2627
repositories {
28+
exclusiveContent {
29+
filter {
30+
includeGroup "com.facebook.react"
31+
}
32+
forRepository {
33+
maven {
34+
url "$rootDir/../node_modules/react-native/android"
35+
}
36+
}
37+
}
2738
mavenLocal()
2839
maven {
2940
// All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
@@ -35,6 +46,7 @@ allprojects {
3546
}
3647
google()
3748
jcenter()
49+
mavenCentral()
3850
maven { url 'https://www.jitpack.io' }
3951
}
4052
}

react-native-in-app-payments-quickstart/android/gradle.properties

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
# This option should only be used with decoupled projects. More details, visit
1717
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
1818
# org.gradle.parallel=true
19-
android.jetifier.ignorelist=moshi-1.13.0
20-
android.jetifier.blacklist=moshi-1.13.0
2119
android.useAndroidX=true
2220
android.enableJetifier=true
2321

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed Aug 25 06:29:34 IST 2021
1+
#Fri Nov 04 11:37:42 IST 2022
22
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
44
distributionPath=wrapper/dists
55
zipStorePath=wrapper/dists
66
zipStoreBase=GRADLE_USER_HOME
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
rootProject.name = 'RNInAppPaymentsQuickstart'
2+
include ':react-native-gesture-handler'
3+
project(':react-native-gesture-handler').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-gesture-handler/android')
24

35
apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
46
include ':app'

react-native-in-app-payments-quickstart/ios/Podfile

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,16 @@ target 'RNInAppPaymentsQuickstart' do
2121
# you should disable the next line.
2222
# use_flipper!()
2323

24+
pod 'RNGestureHandler', :path => '../node_modules/react-native-gesture-handler'
25+
2426
post_install do |installer|
2527
react_native_post_install(installer)
28+
installer.pods_project.build_configurations.each do |config|
29+
config.build_settings["EXCLUDED_ARCHS[sdk=iphonesimulator*]"] = "arm64"
30+
end
2631
end
27-
end
32+
33+
# post_install do |installer|
34+
# react_native_post_install(installer)
35+
# end
36+
end

react-native-in-app-payments-quickstart/ios/Podfile.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ PODS:
283283
- React-jsi (= 0.68.0)
284284
- React-logger (= 0.68.0)
285285
- React-perflogger (= 0.68.0)
286-
- RNGestureHandler (2.4.2):
286+
- RNGestureHandler (2.9.0):
287287
- React-Core
288288
- RNSquareInAppPayments (1.5.6):
289289
- React
@@ -436,12 +436,12 @@ SPEC CHECKSUMS:
436436
React-RCTVibration: 82fc52d3d96549b8c59a6c8c017d5a1a11457049
437437
React-runtimeexecutor: 9b1304f48e344c55bb3c36e13bf11461cb4da5d8
438438
ReactCommon: fab89a13b52f1ac42b59a0e4b4f76f21aea9eebe
439-
RNGestureHandler: 61628a2c859172551aa2100d3e73d1e57878392f
439+
RNGestureHandler: 071d7a9ad81e8b83fe7663b303d132406a7d8f39
440440
RNSquareInAppPayments: 3b4f6e96d1575c856255de00b27f36e702db45d4
441441
SquareBuyerVerificationSDK: d1253b4ed9a1226dc8d4b5bc800cd47886768078
442442
SquareInAppPaymentsSDK: 99476a38e643d4f2ebf86c0c2167752553683481
443443
Yoga: 6671cf077f614314c22fd09ddf87d7abeee64e96
444444

445-
PODFILE CHECKSUM: 2728a904d5b354027fbf0b425c43ff65f66b7e35
445+
PODFILE CHECKSUM: 1d41a1d217b2c7cc0e90c8b7bf895c82a760b977
446446

447447
COCOAPODS: 1.11.3

react-native-in-app-payments-quickstart/ios/RNInAppPaymentsQuickstart.xcodeproj/project.pbxproj

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
1515
31618CB9F61E48A0857E0EFE /* libRNGestureHandler.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DE6BCB3A1728442EB9F5104E /* libRNGestureHandler.a */; };
1616
59F1AC18231992AF00621E95 /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 59F1ABF1231992AF00621E95 /* JavaScriptCore.framework */; };
17-
7D2F321427389C7D3B9CF13E /* libPods-RNInAppPaymentsQuickstart.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9D720F16BB491CCD68B66501 /* libPods-RNInAppPaymentsQuickstart.a */; };
17+
A96B315A82207DB42672CC35 /* libPods-RNInAppPaymentsQuickstart.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5AC94E46D932A24B73B00614 /* libPods-RNInAppPaymentsQuickstart.a */; };
1818
F108A1E60E2743E49C3E176F /* libRNSquareInAppPayments.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C8CB49B87AF84302B7235299 /* libRNSquareInAppPayments.a */; };
1919
/* End PBXBuildFile section */
2020

@@ -46,7 +46,7 @@
4646
2D16E6891FA4F8E400B85C8A /* libReact.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libReact.a; sourceTree = BUILT_PRODUCTS_DIR; };
4747
315C57ABDEA6FCB718DFE80E /* Pods-RNInAppPaymentsQuickstart.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNInAppPaymentsQuickstart.debug.xcconfig"; path = "Target Support Files/Pods-RNInAppPaymentsQuickstart/Pods-RNInAppPaymentsQuickstart.debug.xcconfig"; sourceTree = "<group>"; };
4848
59F1ABF1231992AF00621E95 /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
49-
9D720F16BB491CCD68B66501 /* libPods-RNInAppPaymentsQuickstart.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RNInAppPaymentsQuickstart.a"; sourceTree = BUILT_PRODUCTS_DIR; };
49+
5AC94E46D932A24B73B00614 /* libPods-RNInAppPaymentsQuickstart.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RNInAppPaymentsQuickstart.a"; sourceTree = BUILT_PRODUCTS_DIR; };
5050
C8CB49B87AF84302B7235299 /* libRNSquareInAppPayments.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNSquareInAppPayments.a; sourceTree = "<group>"; };
5151
DE6BCB3A1728442EB9F5104E /* libRNGestureHandler.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNGestureHandler.a; sourceTree = "<group>"; };
5252
/* End PBXFileReference section */
@@ -59,7 +59,7 @@
5959
59F1AC18231992AF00621E95 /* JavaScriptCore.framework in Frameworks */,
6060
F108A1E60E2743E49C3E176F /* libRNSquareInAppPayments.a in Frameworks */,
6161
31618CB9F61E48A0857E0EFE /* libRNGestureHandler.a in Frameworks */,
62-
7D2F321427389C7D3B9CF13E /* libPods-RNInAppPaymentsQuickstart.a in Frameworks */,
62+
A96B315A82207DB42672CC35 /* libPods-RNInAppPaymentsQuickstart.a in Frameworks */,
6363
);
6464
runOnlyForDeploymentPostprocessing = 0;
6565
};
@@ -93,7 +93,7 @@
9393
children = (
9494
59F1ABF1231992AF00621E95 /* JavaScriptCore.framework */,
9595
2D16E6891FA4F8E400B85C8A /* libReact.a */,
96-
9D720F16BB491CCD68B66501 /* libPods-RNInAppPaymentsQuickstart.a */,
96+
5AC94E46D932A24B73B00614 /* libPods-RNInAppPaymentsQuickstart.a */,
9797
);
9898
name = Frameworks;
9999
sourceTree = "<group>";
@@ -151,8 +151,8 @@
151151
13B07F8E1A680F5B00A75B9A /* Resources */,
152152
00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
153153
110233C721F10681008F6C3D /* Embed Frameworks */,
154-
066C72B6FBACF0EC1EC606EC /* [CP] Embed Pods Frameworks */,
155-
5DFE9B67D6F3E5EEF4368CDF /* [CP] Copy Pods Resources */,
154+
C2886A3FABD89AE1F5CEBE88 /* [CP] Embed Pods Frameworks */,
155+
9C514328C64FFA2712F3E5B7 /* [CP] Copy Pods Resources */,
156156
);
157157
buildRules = (
158158
);
@@ -228,21 +228,6 @@
228228
shellPath = /bin/sh;
229229
shellScript = "export NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh\n";
230230
};
231-
066C72B6FBACF0EC1EC606EC /* [CP] Embed Pods Frameworks */ = {
232-
isa = PBXShellScriptBuildPhase;
233-
buildActionMask = 2147483647;
234-
files = (
235-
);
236-
inputPaths = (
237-
);
238-
name = "[CP] Embed Pods Frameworks";
239-
outputPaths = (
240-
);
241-
runOnlyForDeploymentPostprocessing = 0;
242-
shellPath = /bin/sh;
243-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RNInAppPaymentsQuickstart/Pods-RNInAppPaymentsQuickstart-frameworks.sh\"\n";
244-
showEnvVarsInLog = 0;
245-
};
246231
0EDC1B834F3EA06D835C73CF /* [CP] Check Pods Manifest.lock */ = {
247232
isa = PBXShellScriptBuildPhase;
248233
buildActionMask = 2147483647;
@@ -265,7 +250,7 @@
265250
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
266251
showEnvVarsInLog = 0;
267252
};
268-
5DFE9B67D6F3E5EEF4368CDF /* [CP] Copy Pods Resources */ = {
253+
9C514328C64FFA2712F3E5B7 /* [CP] Copy Pods Resources */ = {
269254
isa = PBXShellScriptBuildPhase;
270255
buildActionMask = 2147483647;
271256
files = (
@@ -280,6 +265,21 @@
280265
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RNInAppPaymentsQuickstart/Pods-RNInAppPaymentsQuickstart-resources.sh\"\n";
281266
showEnvVarsInLog = 0;
282267
};
268+
C2886A3FABD89AE1F5CEBE88 /* [CP] Embed Pods Frameworks */ = {
269+
isa = PBXShellScriptBuildPhase;
270+
buildActionMask = 2147483647;
271+
files = (
272+
);
273+
inputPaths = (
274+
);
275+
name = "[CP] Embed Pods Frameworks";
276+
outputPaths = (
277+
);
278+
runOnlyForDeploymentPostprocessing = 0;
279+
shellPath = /bin/sh;
280+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RNInAppPaymentsQuickstart/Pods-RNInAppPaymentsQuickstart-frameworks.sh\"\n";
281+
showEnvVarsInLog = 0;
282+
};
283283
/* End PBXShellScriptBuildPhase section */
284284

285285
/* Begin PBXSourcesBuildPhase section */

0 commit comments

Comments
 (0)