Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: remove flavors in android #6

Merged
merged 2 commits into from
Sep 3, 2024
Merged

chore: remove flavors in android #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
09d4adc
chore: remove flavors in android
hyochan Sep 2, 2024
ec35826
Remove modifyAppBuildGradle function and related references
hyochan Sep 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 0 additions & 30 deletions plugin/__tests__/fixtures/buildGradleFiles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,30 +45,6 @@ missingDimensionStrategy "store", "play"
versionName "1.16.2"
buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()`;

const appBuildGradleWithAmazonStoreIAP = `
apply plugin: "com.android.application"

import com.android.build.OutputFile

def reactNativeArchitectures() {
def value = project.getProperties().get("reactNativeArchitectures")
return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
}

android {
ndkVersion rootProject.ext.ndkVersion

compileSdkVersion rootProject.ext.compileSdkVersion

defaultConfig {
missingDimensionStrategy "store", "amazon"
applicationId 'com.test.withIAP'
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 34
versionName "1.16.2"
buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()`;

const appBuildGradleWithBothIAP = `
apply plugin: "com.android.application"

Expand All @@ -90,11 +66,6 @@ productFlavors {
dimension "appstore"
missingDimensionStrategy "store", "play"
}

amazon {
dimension "appstore"
missingDimensionStrategy "store", "amazon"
}
}

defaultConfig {
Expand Down Expand Up @@ -155,7 +126,6 @@ supportLibVersion = "28.0.0"
}`;

export {
appBuildGradleWithAmazonStoreIAP,
appBuildGradleWithBothIAP,
appBuildGradleWithoutIAP,
appBuildGradleWithPlayStoreIAP,
Expand Down
29 changes: 1 addition & 28 deletions plugin/__tests__/withIAP-test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
import {modifyAppBuildGradle, modifyProjectBuildGradle} from '../src/withIAP';
import {modifyProjectBuildGradle} from '../src/withIAP';

import {
appBuildGradleWithAmazonStoreIAP,
appBuildGradleWithBothIAP,
appBuildGradleWithoutIAP,
appBuildGradleWithPlayStoreIAP,
projectBuildGradleWithIAP,
projectBuildGradleWithoutIAP,
} from './fixtures/buildGradleFiles';
Expand All @@ -25,32 +21,9 @@ describe('Configures Android native project correctly', () => {
);
});

it(`Add play store missingDimenstionStrategy to android/app/build.gradle if is not present`, () => {
expect(
modifyAppBuildGradle(appBuildGradleWithoutIAP, 'Play Store'),
).toMatch(appBuildGradleWithPlayStoreIAP);
});

it(`Add amazon store missingDimenstionStrategy to android/app/build.gradle if is not present`, () => {
expect(
modifyAppBuildGradle(appBuildGradleWithoutIAP, 'Amazon AppStore'),
).toMatch(appBuildGradleWithAmazonStoreIAP);
});

it(`Add play store and amazon payment providers to android/app/build.gradle if is not present`, () => {
expect(modifyAppBuildGradle(appBuildGradleWithoutIAP, 'both')).toMatch(
appBuildGradleWithBothIAP,
);
});
it(`Doesn't modify android/build.gradle if supportLibVersion already configured`, () => {
expect(modifyProjectBuildGradle(projectBuildGradleWithIAP)).toMatch(
projectBuildGradleWithIAP,
);
});

it(`Doesn't modify android/app/build.gradle if missingDimensionStrategy already configured`, () => {
expect(
modifyAppBuildGradle(appBuildGradleWithPlayStoreIAP, 'Play Store'),
).toMatch(appBuildGradleWithPlayStoreIAP);
});
});
87 changes: 3 additions & 84 deletions plugin/src/withIAP.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,11 @@
import {
WarningAggregator,
withAppBuildGradle,
withProjectBuildGradle,
} from 'expo/config-plugins';
import {ConfigPlugin, createRunOncePlugin} from 'expo/config-plugins';

const pkg = require('../../package.json');

type PaymentProvider = 'Amazon AppStore' | 'both' | 'Play Store';

const hasPaymentProviderProperValue = (
paymentProvider: string,
): paymentProvider is PaymentProvider => {
return ['Amazon AppStore', 'Play Store', 'both'].includes(paymentProvider);
};

const linesToAdd: {[key in PaymentProvider]: string} = {
['Amazon AppStore']: `missingDimensionStrategy "store", "amazon"`,
['Play Store']: `missingDimensionStrategy "store", "play"`,
['both']: `flavorDimensions "appstore"

productFlavors {
googlePlay {
dimension "appstore"
missingDimensionStrategy "store", "play"
}

amazon {
dimension "appstore"
missingDimensionStrategy "store", "amazon"
}
}`,
};

const addToBuildGradle = (
newLine: string,
anchor: RegExp | string,
Expand All @@ -46,34 +19,6 @@ const addToBuildGradle = (
return lines.join('\n');
};

export const modifyAppBuildGradle = (
buildGradle: string,
paymentProvider: PaymentProvider,
) => {
if (paymentProvider === 'both') {
if (buildGradle.includes(`flavorDimensions "appstore"`)) {
return buildGradle;
}
return addToBuildGradle(
linesToAdd[paymentProvider],
'defaultConfig',
-1,
buildGradle,
);
}

const missingDimensionStrategy = linesToAdd[paymentProvider];
if (buildGradle.includes(missingDimensionStrategy)) {
return buildGradle;
}
return addToBuildGradle(
missingDimensionStrategy,
'defaultConfig',
1,
buildGradle,
);
};

export const modifyProjectBuildGradle = (buildGradle: string) => {
const supportLibVersion = `supportLibVersion = "28.0.0"`;
if (buildGradle.includes(supportLibVersion)) {
Expand All @@ -82,20 +27,7 @@ export const modifyProjectBuildGradle = (buildGradle: string) => {
return addToBuildGradle(supportLibVersion, 'ext', 1, buildGradle);
};

const withIAPAndroid: ConfigPlugin<{paymentProvider: PaymentProvider}> = (
config,
{paymentProvider},
) => {
// eslint-disable-next-line @typescript-eslint/no-shadow
config = withAppBuildGradle(config, (config) => {
config.modResults.contents = modifyAppBuildGradle(
config.modResults.contents,
paymentProvider,
);
return config;
});

// eslint-disable-next-line @typescript-eslint/no-shadow
const withIAPAndroid: ConfigPlugin = (config) => {
config = withProjectBuildGradle(config, (config) => {
config.modResults.contents = modifyProjectBuildGradle(
config.modResults.contents,
Expand All @@ -105,27 +37,14 @@ const withIAPAndroid: ConfigPlugin<{paymentProvider: PaymentProvider}> = (
return config;
};

interface Props {
paymentProvider?: PaymentProvider;
}
interface Props {}

const withIAP: ConfigPlugin<Props | undefined> = (config, props) => {
const paymentProvider = props?.paymentProvider ?? 'Play Store';

if (!hasPaymentProviderProperValue(paymentProvider)) {
WarningAggregator.addWarningAndroid(
'expo-iap',

`The payment provider '${paymentProvider}' is not supported. Please update your app.json file with one of the following supported values: 'Play Store', 'Amazon AppStore', or 'both'.`,
);
return config;
}
try {
config = withIAPAndroid(config, {paymentProvider});
config = withIAPAndroid(config);
} catch (error) {
WarningAggregator.addWarningAndroid(
'expo-iap',

`There was a problem configuring expo-iap in your native Android project: ${error}`,
);
}
Expand Down
Loading