Skip to content

Update new architecture support #180

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

Merged
nicolas-chaix-didomi merged 8 commits into from
May 26, 2026
Merged

Update new architecture support #180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0a4df16
Update new architecture support
nicolas-chaix-didomi May 19, 2026
3427855
override + old-arch stubs in DidomiModule.kt and DidomiModuleSpec.kt
nicolas-chaix-didomi May 19, 2026
f45247a
forward-declare the Didomi interface inheriting from RCTEventEmitter …
nicolas-chaix-didomi May 19, 2026
80bfecf
Bump native SDK dependencies to 2.43.0
nicolas-chaix-didomi May 25, 2026
294dcdf
Register codegen library for Android autolinking
nicolas-chaix-didomi May 25, 2026
89645b3
Use double for numeric TurboModule arguments on iOS
nicolas-chaix-didomi May 25, 2026
0d66c29
Patch fmt v9 in post_install for Xcode 26 / Clang 21
nicolas-chaix-didomi May 25, 2026
9a9c1af
update gh actions (deprecation warnings)
nicolas-chaix-didomi May 25, 2026
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
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
uses: actions/checkout@v6

- name: Cache Node dependencies
uses: actions/cache@v4
uses: actions/cache@v5
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
node-version: 20

- name: Cache Node dependencies
uses: actions/cache@v4
uses: actions/cache@v5
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
Expand Down Expand Up @@ -61,7 +61,7 @@ jobs:
node-version: 20

- name: Cache Node dependencies
uses: actions/cache@v4
uses: actions/cache@v5
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
Expand All @@ -72,13 +72,13 @@ jobs:
run: npm install

- name: Cache Gradle Wrapper
uses: actions/cache@v4
uses: actions/cache@v5
with:
path: ~/.gradle/wrapper
key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}

- name: Cache Gradle Dependencies
uses: actions/cache@v4
uses: actions/cache@v5
with:
path: ~/.gradle/caches
key: ${{ runner.os }}-gradle-caches-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
Expand All @@ -94,7 +94,7 @@ jobs:
cd android && ./gradlew assembleDebug --no-daemon

- name: Upload Android App APK
uses: actions/upload-artifact@v5
uses: actions/upload-artifact@v7
with:
name: app-debug.apk
path: test/android/app/build/outputs/apk/debug/app-debug.apk
Expand All @@ -104,7 +104,7 @@ jobs:
cd android && ./gradlew :app:assembleDebugAndroidTest --no-daemon

- name: Upload Android Test APK
uses: actions/upload-artifact@v5
uses: actions/upload-artifact@v7
with:
name: app-debug-androidTest.apk
path: test/android/app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk
Expand All @@ -116,7 +116,7 @@ jobs:
credentials_json: ${{ secrets.GCP_CREDENTIALS }}

- name: Setup Cloud SDK
uses: google-github-actions/setup-gcloud@v2
uses: google-github-actions/setup-gcloud@v3
with:
project_id: ${{ secrets.FIREBASE_PROJECT_ID }}
install_components: 'beta'
Expand Down Expand Up @@ -153,7 +153,7 @@ jobs:
registry-url: 'https://registry.npmjs.org'

- name: Cache Node dependencies
uses: actions/cache@v4
uses: actions/cache@v5
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
Expand All @@ -179,7 +179,7 @@ jobs:
# Archive Result if failure
- name: Archive iOS artifacts
if: ${{ failure() }}
uses: actions/upload-artifact@v5
uses: actions/upload-artifact@v7
with:
name: ios-test-results
path: /Users/runner/Library/Developer/Xcode/DerivedData/**/*.xcresult
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
node-version: 20

- name: Cache Node dependencies
uses: actions/cache@v4
uses: actions/cache@v5
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
Expand All @@ -34,7 +34,7 @@ jobs:

- name: Install dependencies
run: npm install

- name: Run JS tests
run: npm test

Expand All @@ -61,7 +61,7 @@ jobs:
node-version: 20

- name: Cache Node dependencies
uses: actions/cache@v4
uses: actions/cache@v5
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
Expand All @@ -72,13 +72,13 @@ jobs:
run: npm install

- name: Cache Gradle Wrapper
uses: actions/cache@v4
uses: actions/cache@v5
with:
path: ~/.gradle/wrapper
key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}

- name: Cache Gradle Dependencies
uses: actions/cache@v4
uses: actions/cache@v5
with:
path: ~/.gradle/caches
key: ${{ runner.os }}-gradle-caches-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
Expand All @@ -94,7 +94,7 @@ jobs:
cd android && ./gradlew assembleDebug --no-daemon

- name: Upload Android App APK
uses: actions/upload-artifact@v5
uses: actions/upload-artifact@v7
with:
name: app-debug.apk
path: test/android/app/build/outputs/apk/debug/app-debug.apk
Expand All @@ -104,7 +104,7 @@ jobs:
cd android && ./gradlew :app:assembleDebugAndroidTest --no-daemon

- name: Upload Android Test APK
uses: actions/upload-artifact@v5
uses: actions/upload-artifact@v7
with:
name: app-debug-androidTest.apk
path: test/android/app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk
Expand All @@ -116,7 +116,7 @@ jobs:
credentials_json: ${{ secrets.GCP_CREDENTIALS }}

- name: Setup Cloud SDK
uses: google-github-actions/setup-gcloud@v2
uses: google-github-actions/setup-gcloud@v3
with:
project_id: ${{ secrets.FIREBASE_PROJECT_ID }}
install_components: 'beta'
Expand Down Expand Up @@ -153,7 +153,7 @@ jobs:
registry-url: 'https://registry.npmjs.org'

- name: Cache Node dependencies
uses: actions/cache@v4
uses: actions/cache@v5
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
Expand Down Expand Up @@ -182,7 +182,7 @@ jobs:
# Archive Result if failure
- name: Archive iOS artifacts
if: ${{ failure() }}
uses: actions/upload-artifact@v5
uses: actions/upload-artifact@v7
with:
name: ios-test-results
path: /Users/runner/Library/Developer/Xcode/DerivedData/**/*.xcresult
Expand Down
31 changes: 29 additions & 2 deletions android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ buildscript {

apply plugin: "com.android.library"
apply plugin: "kotlin-android"
apply plugin: "com.facebook.react"

def getExtOrDefault(name) {
return project.properties["Didomi_" + name].toString()
Expand All @@ -26,19 +27,39 @@ def getExtOrIntegerDefault(name) {
return project.properties["Didomi_" + name].toInteger()
}

def isNewArchitectureEnabled() {
return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
}

def parsedPackage = new JsonSlurper().parseText(file("../package.json").text)

android {
compileSdk getExtOrIntegerDefault("compileSdkVersion")
namespace "io.didomi.reactnative"

defaultConfig {
minSdk getExtOrIntegerDefault("minSdkVersion")
targetSdk getExtOrIntegerDefault("targetSdkVersion")
versionCode 1
versionName "${parsedPackage.version}"

multiDexEnabled = true

buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
}

buildFeatures {
buildConfig = true
}

sourceSets {
main {
if (isNewArchitectureEnabled()) {
java.srcDirs += ['src/newarch/java']
} else {
java.srcDirs += ['src/oldarch/java']
}
}
}

buildTypes {
Expand All @@ -60,6 +81,12 @@ android {

}

react {
jsRootDir = file("../src/specs")
libraryName = "RNDidomiSpec"
codegenJavaPackageName = "io.didomi.reactnative"
}

repositories {
google()
mavenLocal()
Expand Down Expand Up @@ -131,5 +158,5 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"

implementation("com.google.code.gson:gson:2.13.1")
implementation "io.didomi.sdk:android:2.42.0"
implementation "io.didomi.sdk:android:2.43.0"
}
Loading