Skip to content

Commit 2439a95

Browse files
markmurkiftio
andauthored
Rename namespace (#40)
* update the sample app package and namespace to something unique to allow uploading to google play * Upgrade java to 17, run tests without turbo --------- Co-authored-by: Daniel Kift <[email protected]>
1 parent 1471bb3 commit 2439a95

File tree

5 files changed

+11
-32
lines changed

5 files changed

+11
-32
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -60,40 +60,17 @@ jobs:
6060
- name: Setup
6161
uses: ./.github/actions/setup
6262

63-
- name: Check turbo cache
64-
uses: ./.github/actions/use-turbo-cache
65-
66-
- name: Check build cache
67-
run: |
68-
CACHE_STATUS=$(./scripts/check_cache sample test:android)
69-
echo "[sample] test:android - $CACHE_STATUS"
70-
echo "turbo_cache_hit=$CACHE_STATUS" >> $GITHUB_ENV
71-
7263
- name: Install JDK
73-
if: env.turbo_cache_hit != 1
64+
# if: env.turbo_cache_hit != 1
7465
uses: actions/setup-java@v3
7566
with:
7667
distribution: 'zulu'
77-
java-version: '11'
78-
79-
- name: Cache Gradle dependencies
80-
if: env.turbo_cache_hit != 1
81-
uses: actions/cache@v3
82-
with:
83-
path: |
84-
~/.gradle/wrapper
85-
~/.gradle/caches
86-
sample/android/.gradle/wrapper
87-
sample/android/.gradle/caches
88-
key: |
89-
${{ runner.os }}-gradle-${{ hashFiles('sample/android/gradle/wrapper/gradle-wrapper.properties') }}
90-
restore-keys: |
91-
${{ runner.os }}-gradle-
68+
java-version: '17'
9269

9370
- name: Run Android tests
94-
# If turbo has already cached the build it will return instantly here
9571
run: |
96-
yarn turbo run test:android --cache-dir=".turbo" --no-daemon
72+
yarn module build
73+
yarn sample test:android
9774
9875
test-ios:
9976
name: Run iOS Tests

sample/android/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,9 @@ android {
8484
}
8585
}
8686

87-
namespace "com.reactnative"
87+
namespace "com.shopify.checkoutkitreactnative"
8888
defaultConfig {
89-
applicationId "com.reactnative"
89+
applicationId "com.shopify.checkoutkitreactnative"
9090
minSdkVersion rootProject.ext.minSdkVersion
9191
targetSdkVersion rootProject.ext.targetSdkVersion
9292
versionCode 1

sample/android/app/src/main/java/com/reactnative/MainActivity.java renamed to sample/android/app/src/main/java/com/shopify/checkoutkitreactnative/MainActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.reactnative;
1+
package com.shopify.checkoutkitreactnative;
22

33
import com.facebook.react.ReactActivity;
44
import com.facebook.react.ReactActivityDelegate;

sample/android/app/src/main/java/com/reactnative/MainApplication.java renamed to sample/android/app/src/main/java/com/shopify/checkoutkitreactnative/MainApplication.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.reactnative;
1+
package com.shopify.checkoutkitreactnative;
22

33
import android.app.Application;
44
import com.facebook.react.PackageList;
@@ -8,6 +8,8 @@
88
import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint;
99
import com.facebook.react.defaults.DefaultReactNativeHost;
1010
import com.facebook.soloader.SoLoader;
11+
import com.reactnative.ReactNativeFlipper;
12+
1113
import java.util.List;
1214

1315
public class MainApplication extends Application implements ReactApplication {

sample/android/app/src/test/java/com/reactnative/ShopifyCheckoutKitModuleTest.java renamed to sample/android/app/src/test/java/com/shopify/checkoutkitreactnative/ShopifyCheckoutKitModuleTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.reactnative;
1+
package com.shopify.checkoutkitreactnative;
22

33
import androidx.activity.ComponentActivity;
44

0 commit comments

Comments
 (0)