chore(ffmpeg-kit-react-native): update plugin to use AndroidConfig.Version.withBuildScriptExtMinimumVersion (#60)

Summary:
Just updates the usage of withBuildScriptExtMinimumVersion to use
AndroidConfig.Version's withBuildScriptExtMinimumVersion directly.

packages/ffmpeg-kit-react-native/build/withBuildScriptExtMinimumVersion.d.ts

@@ -1,10 +0,0 @@
-import { ConfigPlugin } from "@expo/config-plugins";
-/** Sets a numeric version for a value in the project.gradle buildscript.ext object to be at least the provided props.minVersion, if the existing value is greater then no change will be made. */
-export declare const withBuildScriptExtMinimumVersion: ConfigPlugin<{
-    name: string;
-    minVersion: number;
-}>;
-export declare function setMinBuildScriptExtVersion(buildGradle: string, { name, minVersion }: {
-    name: string;
-    minVersion: number;
-}): string;

packages/ffmpeg-kit-react-native/build/withBuildScriptExtMinimumVersion.js

@@ -1,31 +0,0 @@
-"use strict";
-// Copied from https://github.com/expo/expo-cli/blob/main/packages/config-plugins/src/android/Version.ts
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.setMinBuildScriptExtVersion = exports.withBuildScriptExtMinimumVersion = void 0;
-const config_plugins_1 = require("@expo/config-plugins");
-/** Sets a numeric version for a value in the project.gradle buildscript.ext object to be at least the provided props.minVersion, if the existing value is greater then no change will be made. */
-const withBuildScriptExtMinimumVersion = (config, props) => {
-    return config_plugins_1.withProjectBuildGradle(config, (config) => {
-        if (config.modResults.language === "groovy") {
-            config.modResults.contents = setMinBuildScriptExtVersion(config.modResults.contents, props);
-        }
-        else {
-            config_plugins_1.WarningAggregator.addWarningAndroid("withBuildScriptExtVersion", `Cannot automatically configure project build.gradle if it's not groovy`);
-        }
-        return config;
-    });
-};
-exports.withBuildScriptExtMinimumVersion = withBuildScriptExtMinimumVersion;
-function setMinBuildScriptExtVersion(buildGradle, { name, minVersion }) {
-    var _a;
-    const regex = new RegExp(`(${name}\\s?=\\s?)(\\d+(?:\\.\\d+)?)`);
-    const currentVersion = (_a = buildGradle.match(regex)) === null || _a === void 0 ? void 0 : _a[2];
-    if (!currentVersion) {
-        config_plugins_1.WarningAggregator.addWarningAndroid("withBuildScriptExtVersion", `Cannot set minimum buildscript.ext.${name} version because the property "${name}" cannot be found or does not have a numeric value.`);
-        // TODO: Maybe just add the property...
-        return buildGradle;
-    }
-    const currentVersionNum = Number(currentVersion);
-    return buildGradle.replace(regex, `$1${Math.max(minVersion, currentVersionNum)}`);
-}
-exports.setMinBuildScriptExtVersion = setMinBuildScriptExtVersion;

packages/ffmpeg-kit-react-native/build/withFFMPEG.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const config_plugins_1 = require("@expo/config-plugins");
 const withAndroidFFMPEGPackage_1 = require("./withAndroidFFMPEGPackage");
-const withBuildScriptExtMinimumVersion_1 = require("./withBuildScriptExtMinimumVersion");
 const withCocoaPodsImport_1 = require("./withCocoaPodsImport");
 const withIosDeploymentTarget_1 = require("./withIosDeploymentTarget");
 let pkg = {
@@ -31,7 +30,7 @@ const withFFMPEG = (config, _props) => {
         // Android
         // Set min SDK Version to 24.
         [
-            withBuildScriptExtMinimumVersion_1.withBuildScriptExtMinimumVersion,
+            config_plugins_1.AndroidConfig.Version.withBuildScriptExtMinimumVersion,
             {
                 name: "minSdkVersion",
                 minVersion: 24,

packages/ffmpeg-kit-react-native/src/__tests__/withBuildScriptExtMinimumVersion-test.ts

@@ -1,89 +0,0 @@
-import { WarningAggregator } from "@expo/config-plugins";
-import { setMinBuildScriptExtVersion } from "../withBuildScriptExtMinimumVersion";
-
-const EXAMPLE_PROJECT_BUILD_GRADLE = `
-buildscript {
-    ext {
-        buildToolsVersion = "29.0.3"
-        minSdkVersion = 21
-        compileSdkVersion = 30
-        targetSdkVersion = 30
-        oddFormat = 30.2
-    }
-    repositories {
-    }
-    dependencies {
-    }
-}
-
-allprojects {
-    repositories {
-        mavenLocal()
-        maven {
-            // Android JSC is installed from npm
-            url(new File(["node", "--print", "require.resolve('jsc-android/package.json')"].execute(null, rootDir).text.trim(), "../dist"))
-        }
-    }
-}
-`;
-
-describe(setMinBuildScriptExtVersion, () => {
-  beforeEach(() => {
-    // @ts-ignore: jest
-    // eslint-disable-next-line import/namespace
-    WarningAggregator.addWarningAndroid = jest.fn();
-  });
-
-  it(`sets the minSdkVersion in build.gradle if minSdkVersion is given`, () => {
-    expect(
-      setMinBuildScriptExtVersion(EXAMPLE_PROJECT_BUILD_GRADLE, {
-        name: "minSdkVersion",
-        minVersion: 22,
-      })
-    ).toMatch(/minSdkVersion = 22/);
-    expect(WarningAggregator.addWarningAndroid).not.toHaveBeenCalled();
-  });
-
-  it(`sets the oddFormat in build.gradle if oddFormat is given`, () => {
-    expect(
-      setMinBuildScriptExtVersion(EXAMPLE_PROJECT_BUILD_GRADLE, {
-        name: "oddFormat",
-        minVersion: 30.3,
-      })
-    ).toMatch(/oddFormat = 30\.3/);
-    expect(WarningAggregator.addWarningAndroid).not.toHaveBeenCalled();
-  });
-  it(`does not change the compileSdkVersion in build.gradle if compileSdkVersion is lower than the existing value`, () => {
-    expect(
-      setMinBuildScriptExtVersion(EXAMPLE_PROJECT_BUILD_GRADLE, {
-        name: "compileSdkVersion",
-        minVersion: 12,
-      })
-    ).toBe(EXAMPLE_PROJECT_BUILD_GRADLE);
-    expect(WarningAggregator.addWarningAndroid).not.toHaveBeenCalled();
-  });
-  it(`warns when it cannot find the requested value`, () => {
-    expect(
-      setMinBuildScriptExtVersion(EXAMPLE_PROJECT_BUILD_GRADLE, {
-        name: "foobar",
-        minVersion: 12,
-      })
-    ).toBe(EXAMPLE_PROJECT_BUILD_GRADLE);
-    expect(WarningAggregator.addWarningAndroid).toBeCalledWith(
-      "withBuildScriptExtVersion",
-      'Cannot set minimum buildscript.ext.foobar version because the property "foobar" cannot be found or does not have a numeric value.'
-    );
-  });
-  it(`does warns when targeting a property with a string value`, () => {
-    expect(
-      setMinBuildScriptExtVersion(EXAMPLE_PROJECT_BUILD_GRADLE, {
-        name: "buildToolsVersion",
-        minVersion: 12,
-      })
-    ).toBe(EXAMPLE_PROJECT_BUILD_GRADLE);
-    expect(WarningAggregator.addWarningAndroid).toBeCalledWith(
-      "withBuildScriptExtVersion",
-      'Cannot set minimum buildscript.ext.buildToolsVersion version because the property "buildToolsVersion" cannot be found or does not have a numeric value.'
-    );
-  });
-});

packages/ffmpeg-kit-react-native/src/withBuildScriptExtMinimumVersion.ts

@@ -1,50 +0,0 @@
-// Copied from https://github.com/expo/expo-cli/blob/main/packages/config-plugins/src/android/Version.ts
-
-import {
-  ConfigPlugin,
-  WarningAggregator,
-  withProjectBuildGradle,
-} from "@expo/config-plugins";
-
-/** Sets a numeric version for a value in the project.gradle buildscript.ext object to be at least the provided props.minVersion, if the existing value is greater then no change will be made. */
-export const withBuildScriptExtMinimumVersion: ConfigPlugin<{
-  name: string;
-  minVersion: number;
-}> = (config, props) => {
-  return withProjectBuildGradle(config, (config) => {
-    if (config.modResults.language === "groovy") {
-      config.modResults.contents = setMinBuildScriptExtVersion(
-        config.modResults.contents,
-        props
-      );
-    } else {
-      WarningAggregator.addWarningAndroid(
-        "withBuildScriptExtVersion",
-        `Cannot automatically configure project build.gradle if it's not groovy`
-      );
-    }
-    return config;
-  });
-};
-
-export function setMinBuildScriptExtVersion(
-  buildGradle: string,
-  { name, minVersion }: { name: string; minVersion: number }
-) {
-  const regex = new RegExp(`(${name}\\s?=\\s?)(\\d+(?:\\.\\d+)?)`);
-  const currentVersion = buildGradle.match(regex)?.[2];
-  if (!currentVersion) {
-    WarningAggregator.addWarningAndroid(
-      "withBuildScriptExtVersion",
-      `Cannot set minimum buildscript.ext.${name} version because the property "${name}" cannot be found or does not have a numeric value.`
-    );
-    // TODO: Maybe just add the property...
-    return buildGradle;
-  }
-
-  const currentVersionNum = Number(currentVersion);
-  return buildGradle.replace(
-    regex,
-    `$1${Math.max(minVersion, currentVersionNum)}`
-  );
-}

packages/ffmpeg-kit-react-native/src/withFFMPEG.ts

@@ -1,11 +1,11 @@
 import {
+  AndroidConfig,
   ConfigPlugin,
   createRunOncePlugin,
   withPlugins,
 } from "@expo/config-plugins";
 
 import { withAndroidFFMPEGPackage } from "./withAndroidFFMPEGPackage";
-import { withBuildScriptExtMinimumVersion } from "./withBuildScriptExtMinimumVersion";
 import {
   withCocoaPodsImport,
   withPodfilePropertiesPackage,
@@ -56,7 +56,7 @@ const withFFMPEG: ConfigPlugin<void | Props> = (config, _props) => {
 
     // Set min SDK Version to 24.
     [
-      withBuildScriptExtMinimumVersion,
+      AndroidConfig.Version.withBuildScriptExtMinimumVersion,
       {
         name: "minSdkVersion",
         minVersion: 24,