react-native-daro 1.0.15 → 2.0.0-rc.1

package/plugin/build/index.js

@@ -1,70 +1,35 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 const withAndroid_1 = require("./withAndroid");
 const withIos_1 = require("./withIos");
-const fs = __importStar(require("fs"));
-const path = __importStar(require("path"));
-const PACKAGE_MEDIATION = {
-    'react-native-daro': 'admob',
-    'react-native-daro-m': 'max',
+// 통합 SDK 는 플랫폼당 INTEGRATION KEY 하나만 받는다. 구 프로퍼티가 오면 어디를
+// 고쳐야 하는지 알려주며 실패한다.
+const LEGACY_PROPS = {
+    android: ['daroAppKey', 'daroKeyFile'],
+    ios: ['daroAppKey', 'daroKeyFile', 'admobAppId'],
 };
-function getPackageMediation() {
-    try {
-        const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
-        const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
-        return packageJson.name ? PACKAGE_MEDIATION[packageJson.name] : undefined;
-    }
-    catch {
-        return undefined;
+function assertNoLegacyProps(platform, props) {
+    const legacy = LEGACY_PROPS[platform].filter((key) => key in props);
+    if (legacy.length > 0) {
+        throw new Error(`[daro-react-native] "${platform}.${legacy.join(`", "${platform}.`)}" ` +
+            'is no longer supported. The unified Daro SDK takes a single ' +
+            `"${platform}.daroIntegrationKey" instead — the build-time tooling ` +
+            'derives the app keys from it.');
     }
 }
+// **미디에이션으로 분기하지 않는다.** 통합 SDK 는 AdMob·MAX 를 한 아티팩트에 담아
+// 빌드타임 분기가 없다(android/build.gradle, DaroReactNative.podspec). 한때 여기서
+// 패키지 이름을 읽어 admob/max 를 판정하고 둘 중 하나가 아니면 던졌는데, 판정한 값은
+// 그 뒤로 쓰이지 않는 순수 게이트였고 통합 패키지명(daro-react-native)에서는 **항상**
+// 걸렸다 — example 이 이 진입점을 우회하고 있어서 드러나지 않았을 뿐이다 (DARO-1458).
 const withDaro = (config, props) => {
-    const mediation = getPackageMediation();
-    if (!mediation) {
-        throw new Error('[daro-react-native] The config plugin must be loaded from ' +
-            '"react-native-daro" or "react-native-daro-m".');
-    }
     if (props?.ios) {
-        config = (0, withIos_1.withIosConfiguration)(config, { ...props.ios, mediation });
+        assertNoLegacyProps('ios', props.ios);
+        config = (0, withIos_1.withIosConfiguration)(config, props.ios);
     }
     if (props?.android) {
-        config = (0, withAndroid_1.withAndroidConfiguration)(config, {
-            ...props.android,
-            mediation,
-        });
+        assertNoLegacyProps('android', props.android);
+        config = (0, withAndroid_1.withAndroidConfiguration)(config, props.android);
     }
     return config;
 };

package/plugin/build/withAndroid.d.ts

@@ -1,7 +1,3 @@
 import type { ConfigPlugin } from 'expo/config-plugins';
-import type { DaroAndroidProps, DaroMediation } from './index';
-type DaroResolvedAndroidProps = DaroAndroidProps & {
-    mediation: DaroMediation;
-};
-export declare const withAndroidConfiguration: ConfigPlugin<DaroResolvedAndroidProps>;
-export {};
+import type { DaroAndroidProps } from './index';
+export declare const withAndroidConfiguration: ConfigPlugin<DaroAndroidProps>;

package/plugin/build/withAndroid.js

@@ -1,56 +1,40 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.withAndroidConfiguration = void 0;
 const config_plugins_1 = require("expo/config-plugins");
-const fs = __importStar(require("fs"));
-const path = __importStar(require("path"));
-const KEY_FILE_NAME = 'android-daro-key.txt';
-const DARO_GRADLE_PLUGIN_CLASSPATH = 'so.daro:daro-plugin:1.0.13';
+const JETIFIER_IGNORELIST_KEY = 'android.jetifier.ignorelist';
+const JETIFIER_IGNORELIST_ENTRIES = ['react-android', 'hermes-android'];
+// daro-sdk 의 Google 미디에이션 어댑터들(fyber·inmobi·ironsource 등)이 kotlin-stdlib
+// 2.3.0 을 끌어온다 — 2.3 메타데이터는 Kotlin ≥2.2 컴파일러만 읽는다. Expo 기본
+// 툴체인(2.1.x)은 컴파일이 깨지므로, 앱이 직접 지정하지 않았을 때만 올려준다.
+// 2.2.20 인 이유: Expo 의 Kotlin→KSP 매핑이 지원하는 최신 2.2 계열이다.
+const KOTLIN_VERSION_KEY = 'android.kotlinVersion';
+const MIN_KOTLIN_VERSION = '2.2.20';
+const DARO_GRADLE_PLUGIN_CLASSPATH = 'so.daro:daro-plugin:1.1.0-beta04';
+// 통합 so.daro 플러그인이 release 빌드에 applovin-quality-service 를 스스로 적용한다 —
+// 그 플러그인 id 가 해석되려면 classpath 와 AppLovin buildscript repo 가 앱에 있어야 한다.
 const MAX_QUALITY_CLASSPATH = 'com.applovin.quality:AppLovinQualityServiceGradlePlugin:5.5.2';
-const MAX_MAVEN_REPO = 'https://artifacts.applovin.com/android';
-const DARO_APP_PLUGIN_IDS = {
-    admob: 'so.daro.a',
-    max: 'so.daro.m',
-};
+const APPLOVIN_MAVEN_REPO = 'https://artifacts.applovin.com/android';
+// 통합 daro-sdk 가 싣는 어댑터 전체의 repo 목록 — android/daro-android-qa
+// settings.gradle.kts 의 검증된 목록을 미러링한다 (QA 앱이 같은 좌표를 해결한다).
 const DARO_MAVEN_REPOS = [
     'https://artifact.bytedance.com/repository/pangle',
-    'https://cboost.jfrog.io/artifactory/chartboost-ads/',
-    'https://android-sdk.is.com/',
+    'https://verve.jfrog.io/artifactory/verve-gradle-release',
+    'https://android-sdk.is.com',
     'https://dl-maven-android.mintegral.com/repository/mbridge_android_sdk_oversea',
+    'https://repo.premiumads.net/artifactory/mobile-ads-sdk/',
+    'https://repo.pubmatic.com/artifactory/public-repos',
+    'https://maven.ogury.co',
+    APPLOVIN_MAVEN_REPO,
 ];
+const DARO_APP_PLUGIN_ID = 'so.daro';
+const DARO_APP_PLUGIN_LINE = `apply plugin: "${DARO_APP_PLUGIN_ID}"`;
+// **이 값은 android/build.gradle 의 daroSdkDependency 와 같아야 한다.** 라이브러리는
+// compileOnly 로 물고 compileOnly 는 전이되지 않으므로, 소비자 런타임에 실제로 실리는
+// 것은 여기서 꽂는 이 좌표 하나뿐이다. 갈리면 우리 Kotlin 이 새 시그니처로 컴파일되어
+// 옛 아티팩트 위에서 돈다 (DARO-1591 — 복제 자체를 없애는 것은 그 이슈에 남아 있다).
+const DARO_SDK_DEPENDENCY = 'so.daro:daro-sdk:2.0.0-rc.2';
+const DARO_SDK_DEPENDENCY_LINE_PATTERN = /^\s*(?:implementation|api|compileOnly|runtimeOnly)\s*(?:\(\s*)?['"]so\.daro:daro-(?:[am]|sdk):[^'"]+['"]\s*\)?\s*(?:\/\/.*)?$/gm;
 function replaceOrThrow(contents, pattern, replacement, target) {
     if (!pattern.test(contents)) {
         throw new Error(`[daro-react-native] Cannot automatically update android/build.gradle. ` +
@@ -58,9 +42,65 @@ function replaceOrThrow(contents, pattern, replacement, target) {
     }
     return contents.replace(pattern, replacement);
 }
+function findClosingBrace(contents, openBraceIndex) {
+    let depth = 0;
+    for (let index = openBraceIndex; index < contents.length; index += 1) {
+        const char = contents[index];
+        if (char === '{') {
+            depth += 1;
+        }
+        else if (char === '}') {
+            depth -= 1;
+            if (depth === 0)
+                return index;
+        }
+    }
+    throw new Error('[daro-react-native] Cannot automatically update android/build.gradle. ' +
+        'Expected to find a complete repositories block.');
+}
+function findRepositoriesBlock(contents, pattern, target) {
+    const match = pattern.exec(contents);
+    if (!match) {
+        throw new Error(`[daro-react-native] Cannot automatically update android/build.gradle. ` +
+            `Expected to find ${target}.`);
+    }
+    const openBraceIndex = match.index + match[0].lastIndexOf('{');
+    const closeBraceIndex = findClosingBrace(contents, openBraceIndex);
+    return {
+        insertIndex: match.index + match[0].length,
+        contentStartIndex: openBraceIndex + 1,
+        contents: contents.slice(openBraceIndex + 1, closeBraceIndex),
+    };
+}
+function addMavenRepositories(contents, pattern, urls, target) {
+    const repositoriesBlock = findRepositoriesBlock(contents, pattern, target);
+    const missingUrls = urls.filter((url) => !repositoriesBlock.contents.includes(url));
+    if (missingUrls.length === 0)
+        return contents;
+    const insertIndex = findRepositoryInsertIndex(repositoriesBlock);
+    return `${contents.slice(0, insertIndex)}\n${missingUrls
+        .map((url) => `    maven { url = uri("${url}") }`)
+        .join('\n')}${contents.slice(insertIndex)}`;
+}
+function findRepositoryInsertIndex(repositoriesBlock) {
+    const preferredAnchor = /mavenCentral\(\)[^\S\r\n]*/.exec(repositoriesBlock.contents) ??
+        /google\(\)[^\S\r\n]*/.exec(repositoriesBlock.contents);
+    return preferredAnchor
+        ? repositoriesBlock.contentStartIndex +
+            preferredAnchor.index +
+            preferredAnchor[0].length
+        : repositoriesBlock.insertIndex;
+}
+function addAppLovinBuildscriptRepository(contents) {
+    const repositoriesBlock = findRepositoriesBlock(contents, /buildscript\s*\{[\s\S]*?repositories\s*\{/, 'a buildscript repositories block');
+    if (repositoriesBlock.contents.includes(APPLOVIN_MAVEN_REPO)) {
+        return contents;
+    }
+    const insertIndex = findRepositoryInsertIndex(repositoriesBlock);
+    const repositoryLine = `\n    maven { url = uri("${APPLOVIN_MAVEN_REPO}") }`;
+    return `${contents.slice(0, insertIndex)}${repositoryLine}${contents.slice(insertIndex)}`;
+}
 const withAndroidConfiguration = (config, props) => {
-    const { mediation } = props;
-    const daroAppPluginId = DARO_APP_PLUGIN_IDS[mediation];
     // 1. project build.gradle: classpath + maven repos
     config = (0, config_plugins_1.withProjectBuildGradle)(config, (gradleConfig) => {
         if (gradleConfig.modResults.language !== 'groovy') {
@@ -71,44 +111,59 @@ const withAndroidConfiguration = (config, props) => {
         if (!contents.includes(DARO_GRADLE_PLUGIN_CLASSPATH)) {
             contents = replaceOrThrow(contents, /dependencies\s*\{/, (match) => `${match}\n    classpath("${DARO_GRADLE_PLUGIN_CLASSPATH}")`, 'a buildscript dependencies block');
         }
-        if (mediation === 'max' && !contents.includes(MAX_QUALITY_CLASSPATH)) {
+        if (!contents.includes(MAX_QUALITY_CLASSPATH)) {
             contents = replaceOrThrow(contents, /dependencies\s*\{/, (match) => `${match}\n    classpath("${MAX_QUALITY_CLASSPATH}")`, 'a buildscript dependencies block');
         }
-        const mavenRepos = mediation === 'max'
-            ? [MAX_MAVEN_REPO, ...DARO_MAVEN_REPOS]
-            : DARO_MAVEN_REPOS;
-        for (const url of mavenRepos) {
-            if (contents.includes(url))
-                continue;
-            contents = replaceOrThrow(contents, /allprojects\s*\{[\s\S]*?repositories\s*\{/, (match) => `${match}\n    maven { url = uri("${url}") }`, 'an allprojects repositories block');
-        }
-        if (mediation === 'max' &&
-            !contents.includes('daro-react-native-max-buildscript-repo')) {
-            contents = replaceOrThrow(contents, /buildscript\s*\{[\s\S]*?repositories\s*\{/, (match) => `${match}\n    // daro-react-native-max-buildscript-repo\n    maven { url = uri("${MAX_MAVEN_REPO}") }`, 'a buildscript repositories block');
-        }
+        contents = addMavenRepositories(contents, /allprojects\s*\{[\s\S]*?repositories\s*\{/, DARO_MAVEN_REPOS, 'an allprojects repositories block');
+        contents = addAppLovinBuildscriptRepository(contents);
+        // 버전 없는 KGP classpath 는 RN gradle plugin 제약(2.1.x)으로 해석된다 —
+        // android.kotlinVersion 속성만으로는 앱 모듈 컴파일러가 안 바뀌므로 여기서 버전을
+        // 명시해 conflict resolution 에서 이기게 한다 (위 MIN_KOTLIN_VERSION 주석 참조).
+        contents = contents.replace(/classpath\((['"])org\.jetbrains\.kotlin:kotlin-gradle-plugin\1\)/, `classpath('org.jetbrains.kotlin:kotlin-gradle-plugin:${MIN_KOTLIN_VERSION}')`);
         gradleConfig.modResults.contents = contents;
         return gradleConfig;
     });
-    // 2. app/build.gradle: apply selected Daro mediation plugin.
+    // 2. app/build.gradle: add the unified Daro SDK dependency and plugin.
     config = (0, config_plugins_1.withAppBuildGradle)(config, (gradleConfig) => {
         if (gradleConfig.modResults.language !== 'groovy') {
             config_plugins_1.WarningAggregator.addWarningAndroid('daro-react-native', 'Cannot automatically configure app/build.gradle if it is not groovy.');
             return gradleConfig;
         }
-        let contents = gradleConfig.modResults.contents.replace(/\n?apply plugin: ['"]so\.daro\.[am]['"]\n?/g, '\n');
-        if (contents.includes(daroAppPluginId))
-            return gradleConfig;
-        gradleConfig.modResults.contents = `${contents.trimEnd()}\napply plugin: "${daroAppPluginId}"\n`;
+        let contents = gradleConfig.modResults.contents.replace(/\n?apply plugin: ['"]so\.daro(?:\.[am])?['"]\n?/g, '\n');
+        contents = contents.replace(DARO_SDK_DEPENDENCY_LINE_PATTERN, '');
+        contents = replaceOrThrow(contents, /dependencies\s*\{/, (match) => `${match}\n    implementation("${DARO_SDK_DEPENDENCY}")`, 'an app dependencies block');
+        contents = `${contents.trimEnd()}\n${DARO_APP_PLUGIN_LINE}\n`;
+        gradleConfig.modResults.contents = contents;
         return gradleConfig;
     });
-    // 3. gradle.properties: daroAppKey + Jetifier
-    config = (0, config_plugins_1.withGradleProperties)(config, (propertiesConfig) => {
+    // 3. gradle.properties: daroIntegrationKey + Jetifier
+    // so.daro 플러그인이 빌드타임에 이 속성을 풀어 manifestPlaceholders 를 채운다.
+    return (0, config_plugins_1.withGradleProperties)(config, (propertiesConfig) => {
+        if (!props.daroIntegrationKey?.trim()) {
+            throw new Error('[daro-react-native] "android.daroIntegrationKey" is required. ' +
+                'Set it to the INTEGRATION KEY issued for your Android app.');
+        }
         const entries = [
-            { key: 'daroMediation', value: mediation },
-            { key: 'daroAppKey', value: props.daroAppKey },
+            { key: 'daroIntegrationKey', value: props.daroIntegrationKey },
             { key: 'android.useAndroidX', value: 'true' },
             { key: 'android.enableJetifier', value: 'true' },
         ];
+        const hasKotlinVersion = propertiesConfig.modResults.some((item) => item.type === 'property' && item.key === KOTLIN_VERSION_KEY);
+        if (!hasKotlinVersion) {
+            entries.push({ key: KOTLIN_VERSION_KEY, value: MIN_KOTLIN_VERSION });
+        }
+        const existingIgnorelist = propertiesConfig.modResults
+            .filter((item) => item.type === 'property' && item.key === JETIFIER_IGNORELIST_KEY)
+            .flatMap((item) => item.value.split(','))
+            .map((item) => item.trim())
+            .filter(Boolean);
+        propertiesConfig.modResults = propertiesConfig.modResults.filter((item) => !(item.type === 'property' && item.key === JETIFIER_IGNORELIST_KEY));
+        entries.push({
+            key: JETIFIER_IGNORELIST_KEY,
+            value: [
+                ...new Set([...existingIgnorelist, ...JETIFIER_IGNORELIST_ENTRIES]),
+            ].join(','),
+        });
         for (const { key, value } of entries) {
             const existingIndex = propertiesConfig.modResults.findIndex((item) => item.type === 'property' && item.key === key);
             const entry = { type: 'property', key, value };
@@ -121,20 +176,5 @@ const withAndroidConfiguration = (config, props) => {
         }
         return propertiesConfig;
     });
-    // 4. daroKeyFile을 android/app/ 루트에 복사
-    return (0, config_plugins_1.withDangerousMod)(config, [
-        'android',
-        async (dangerousConfig) => {
-            const sourcePath = path.resolve(dangerousConfig.modRequest.projectRoot, props.daroKeyFile);
-            if (!fs.existsSync(sourcePath)) {
-                throw new Error(`[daro-react-native] Cannot find Android key file at "${sourcePath}". ` +
-                    `Set "android.daroKeyFile" in plugin options to a valid path.`);
-            }
-            const destinationPath = path.resolve(dangerousConfig.modRequest.platformProjectRoot, 'app', KEY_FILE_NAME);
-            fs.mkdirSync(path.dirname(destinationPath), { recursive: true });
-            fs.copyFileSync(sourcePath, destinationPath);
-            return dangerousConfig;
-        },
-    ]);
 };
 exports.withAndroidConfiguration = withAndroidConfiguration;

package/plugin/build/withIos.d.ts

@@ -1,7 +1,3 @@
 import type { ConfigPlugin } from 'expo/config-plugins';
-import type { DaroIosProps, DaroMediation } from './index';
-type DaroResolvedIosProps = DaroIosProps & {
-    mediation: DaroMediation;
-};
-export declare const withIosConfiguration: ConfigPlugin<DaroResolvedIosProps>;
-export {};
+import type { DaroIosProps } from './index';
+export declare const withIosConfiguration: ConfigPlugin<DaroIosProps>;

package/plugin/build/withIos.js

@@ -38,46 +38,49 @@ const config_plugins_1 = require("expo/config-plugins");
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const skAdNetworkIds_1 = require("./skAdNetworkIds");
-const KEY_FILE_NAME = 'ios-daro-key.txt';
 const DEFAULT_ATT_USAGE_DESCRIPTION = 'This identifier will be used to deliver personalized ads to you.';
+// pod install 때 통합 Daro pod 에 실려 오는 INTEGRATION KEY 훅. 소스 Info.plist 의
+// DaroIntegrationKey 를 풀어 DaroAppKey·GADApplicationIdentifier·AppLovin 키를 심는다.
+// post_install 블록은 Podfile 에 하나만 둘 수 있으므로 Expo 가 생성한 기존 블록 안에
+// 끼워 넣는다 — 새로 선언하면 CocoaPods 가 죽는다.
+const PODFILE_HOOK_MARKER = 'daro_integration_key';
+const PODFILE_HOOK_LINES = `    daro_integration_key_hook = Dir.glob(File.expand_path('Pods/*/**/Scripts/daro_integration_key.rb', __dir__)).first
+    raise '[Daro] INTEGRATION KEY hook not found in pods — is the published pod carrying Scripts/?' unless daro_integration_key_hook
+    require daro_integration_key_hook
+    Daro::IntegrationKey.install!(installer)`;
 const withIosConfiguration = (config, props) => {
-    const { mediation } = props;
-    config = (0, config_plugins_1.withInfoPlist)(config, (config) => {
-        config.modResults.DaroAppKey = props.daroAppKey;
-        config.modResults.NSUserTrackingUsageDescription =
-            props.attUsageDescription ?? DEFAULT_ATT_USAGE_DESCRIPTION;
-        if (mediation === 'admob') {
-            if (!props.admobAppId) {
-                throw new Error('[daro-react-native] "ios.admobAppId" is required when mediation is "admob".');
-            }
-            config.modResults.GADApplicationIdentifier = props.admobAppId;
+    config = (0, config_plugins_1.withInfoPlist)(config, (plistConfig) => {
+        if (!props.daroIntegrationKey?.trim()) {
+            throw new Error('[daro-react-native] "ios.daroIntegrationKey" is required. ' +
+                'Set it to the INTEGRATION KEY issued for your iOS app.');
         }
+        plistConfig.modResults.DaroIntegrationKey = props.daroIntegrationKey;
+        plistConfig.modResults.NSUserTrackingUsageDescription =
+            props.attUsageDescription ?? DEFAULT_ATT_USAGE_DESCRIPTION;
         // SKAdNetworkItems: 사용자가 미리 추가한 항목과 머지 (중복 제거)
-        const existing = config.modResults.SKAdNetworkItems ??
-            [];
+        const existing = plistConfig.modResults.SKAdNetworkItems ?? [];
         const existingIds = new Set(existing.map((item) => item.SKAdNetworkIdentifier));
         const additions = skAdNetworkIds_1.DARO_SK_AD_NETWORK_IDS.filter((id) => !existingIds.has(id)).map((id) => ({ SKAdNetworkIdentifier: id }));
-        config.modResults.SKAdNetworkItems = [...existing, ...additions];
-        return config;
-    });
-    return (0, config_plugins_1.withXcodeProject)(config, (config) => {
-        const projectRoot = config.modRequest.projectRoot;
-        const projectName = config.modRequest.projectName ??
-            config_plugins_1.IOSConfig.XcodeUtils.getProjectName(projectRoot);
-        const sourcePath = path.resolve(projectRoot, props.daroKeyFile);
-        if (!fs.existsSync(sourcePath)) {
-            throw new Error(`[daro-react-native] Cannot find iOS key file at "${sourcePath}". ` +
-                `Set "ios.daroKeyFile" in plugin options to a valid path.`);
-        }
-        const destinationPath = path.resolve(config_plugins_1.IOSConfig.Paths.getSourceRoot(projectRoot), KEY_FILE_NAME);
-        fs.copyFileSync(sourcePath, destinationPath);
-        config_plugins_1.IOSConfig.XcodeUtils.addResourceFileToGroup({
-            filepath: `${projectName}/${KEY_FILE_NAME}`,
-            groupName: projectName,
-            project: config.modResults,
-            isBuildFile: true,
-        });
-        return config;
+        plistConfig.modResults.SKAdNetworkItems = [...existing, ...additions];
+        return plistConfig;
     });
+    return (0, config_plugins_1.withDangerousMod)(config, [
+        'ios',
+        async (dangerousConfig) => {
+            const podfilePath = path.join(dangerousConfig.modRequest.platformProjectRoot, 'Podfile');
+            const contents = fs.readFileSync(podfilePath, 'utf8');
+            if (contents.includes(PODFILE_HOOK_MARKER)) {
+                return dangerousConfig;
+            }
+            const anchor = /post_install do \|installer\|\n/;
+            if (!anchor.test(contents)) {
+                throw new Error('[daro-react-native] Cannot find a "post_install do |installer|" ' +
+                    'block in the generated Podfile to install the Daro INTEGRATION ' +
+                    'KEY hook into.');
+            }
+            fs.writeFileSync(podfilePath, contents.replace(anchor, (match) => `${match}${PODFILE_HOOK_LINES}\n`));
+            return dangerousConfig;
+        },
+    ]);
 };
 exports.withIosConfiguration = withIosConfiguration;

package/react-native-daro.podspec

@@ -15,11 +15,13 @@ Pod::Spec.new do |s|
 
   s.source_files = [
     "ios/*.{h,m,mm,swift,cpp}",
-    "ios/mediation/admob/**/*.{h,m,mm,swift,cpp}"
+    "ios/Shared/**/*.{h,m,mm,swift,cpp}",
+    "ios/Paper/**/*.{h,m,mm,swift,cpp}",
+    "ios/Fabric/**/*.{h,m,mm,swift,cpp}"
   ]
   s.private_header_files = "ios/**/*.h"
 
-  s.dependency "DaroAds", "1.1.59"
+  s.dependency "DaroAds", "2.0.0-rc.5"
 
   install_modules_dependencies(s)
 end

package/src/AdBannerView.tsx

@@ -5,17 +5,13 @@ import {
   useImperativeHandle,
   useRef,
   useState,
+  type ElementRef,
 } from 'react';
-import {
-  findNodeHandle,
-  NativeModules,
-  requireNativeComponent,
-  UIManager,
-  View,
-  type DimensionValue,
-  type NativeMethods,
-  type ViewProps,
-} from 'react-native';
+import { View, type ViewProps } from 'react-native';
+import AdBannerViewNativeComponent, {
+  Commands,
+} from './DaroRNAdBannerViewNativeComponent';
+import NativeDaroModule from './NativeDaroModule';
 import type {
   AdBannerViewHandler,
   AdBannerViewProps,
@@ -23,36 +19,26 @@ import type {
 import type { AdNativeEvent } from './types/AdEvent';
 import type { AdInfo, AdLoadFailedInfo } from './types/AdInfo';
 
-const { DaroMModule } = NativeModules;
-
 const { BANNER_AD_FORMAT_LABEL, MREC_AD_FORMAT_LABEL } =
-  DaroMModule.getConstants();
+  NativeDaroModule.getConstants();
 
 export enum AdFormat {
-  BANNER = BANNER_AD_FORMAT_LABEL,
-  MREC = MREC_AD_FORMAT_LABEL,
+  BANNER = 'BANNER',
+  MREC = 'MREC',
 }
 
-type AdViewNativeEvents = {
-  onAdLoadedEvent(event: AdNativeEvent<AdInfo>): void;
-  onAdLoadFailedEvent(event: AdNativeEvent<AdLoadFailedInfo>): void;
-  onAdClickedEvent(event: AdNativeEvent<AdInfo>): void;
-  onAdImpressionRecordedEvent(event: AdNativeEvent<AdInfo>): void;
+const toNativeAdFormat = (adFormat: AdFormat | string): string => {
+  switch (adFormat) {
+    case AdFormat.BANNER:
+      return BANNER_AD_FORMAT_LABEL;
+    case AdFormat.MREC:
+      return MREC_AD_FORMAT_LABEL;
+    default:
+      return adFormat;
+  }
 };
 
-const ComponentName = 'DaroMAdBannerView';
-const AdViewComponent = requireNativeComponent<
-  AdBannerViewProps & ViewProps & AdViewNativeEvents
->(ComponentName);
-type AdViewType = React.Component<AdBannerViewProps> & NativeMethods;
-
-type SizeKey = 'width' | 'height';
-type SizeRecord = Partial<Record<SizeKey, DimensionValue>>;
-
-const ADVIEW_SIZE = {
-  banner: { width: 320, height: 50 },
-  mrec: { width: 300, height: 250 },
-};
+type AdViewType = ElementRef<typeof AdBannerViewNativeComponent>;
 
 export const AdBannerView = forwardRef<
   AdBannerViewHandler,
@@ -61,7 +47,6 @@ export const AdBannerView = forwardRef<
   {
     adUnitId,
     adFormat,
-    placement,
     loadOnMount = true,
     isVisible = true,
     onAdLoaded,
@@ -73,24 +58,12 @@ export const AdBannerView = forwardRef<
   },
   ref
 ) {
-  const adFormatSize = useRef<SizeRecord>({});
   const adViewRef = useRef<AdViewType | null>(null);
   const [isInitialized, setIsInitialized] = useState<boolean>(false);
 
   const loadAd = useCallback(() => {
     if (adViewRef.current) {
-      const nodeHandle = findNodeHandle(adViewRef.current);
-
-      if (typeof nodeHandle !== 'number') {
-        return;
-      }
-
-      UIManager.dispatchViewManagerCommand(
-        nodeHandle,
-        // @ts-ignore: Issue in RN ts defs
-        UIManager.getViewManagerConfig(ComponentName).Commands.loadAd,
-        []
-      );
+      Commands.loadAd(adViewRef.current);
     }
   }, []);
 
@@ -102,18 +75,7 @@ export const AdBannerView = forwardRef<
 
   useEffect(() => {
     (async () => {
-      if (adFormat === AdFormat.BANNER) {
-        adFormatSize.current = {
-          width: ADVIEW_SIZE.banner.width,
-          height: ADVIEW_SIZE.banner.height,
-        };
-      } else {
-        adFormatSize.current = {
-          width: ADVIEW_SIZE.mrec.width,
-          height: ADVIEW_SIZE.mrec.height,
-        };
-      }
-      const initialized = await DaroMModule.isInitialized();
+      const initialized = await NativeDaroModule.isInitialized();
       setIsInitialized(initialized);
 
       if (!initialized) {
@@ -122,7 +84,7 @@ export const AdBannerView = forwardRef<
         );
       }
     })();
-  }, [adFormat]);
+  }, []);
 
   const onAdLoadedEvent = useCallback(
     (event: AdNativeEvent<AdInfo>) => {
@@ -159,12 +121,11 @@ export const AdBannerView = forwardRef<
   }
 
   return (
-    <AdViewComponent
+    <AdBannerViewNativeComponent
       style={style}
-      adFormat={adFormat}
+      adFormat={toNativeAdFormat(adFormat)}
       ref={saveElement}
       adUnitId={adUnitId}
-      placement={placement}
       loadOnMount={loadOnMount}
       isVisible={isVisible}
       onAdLoadedEvent={onAdLoadedEvent}