Skip to content

Commit 40a08c5

Browse files
committed
Update Android compatibility
1 parent 001f7b3 commit 40a08c5

File tree

5 files changed

+982
-2414
lines changed

5 files changed

+982
-2414
lines changed

.github/workflows/build_android.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
fail-fast: false
1212
matrix:
1313
new_arch_enabled: [1, 0]
14-
rn_ver: [latest, 0.75-stable, 0.74-stable, 0.73-stable, 0.72-stable]
14+
rn_ver: [ 0.80.2, 0.79-stable, 0.78-stable, 0.77-stable, 0.76-stable, 0.75-stable, 0.74-stable, 0.73-stable ]
1515

1616
runs-on: ubuntu-24.04
1717

@@ -52,6 +52,9 @@ jobs:
5252
# Enable new arch for Android
5353
if [[ $RCT_NEW_ARCH_ENABLED == '1' ]]; then
5454
sed -i 's/newArchEnabled=false/newArchEnabled=true/' android/gradle.properties
55+
./android/gradlew generateCodegenArtifactsFromSchema -p android
56+
else
57+
sed -i 's/newArchEnabled=true/newArchEnabled=false/' android/gradle.properties
5558
fi
5659
5760
# Build Android App

android/build.gradle

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ buildscript {
33
rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
44
}
55

6-
def kotlin_version = safeExtGet('kotlinVersion', '1.7.0')
6+
def kotlin_version = safeExtGet('kotlinVersion', '2.1.20')
77

88
repositories {
99
google()
1010
gradlePluginPortal()
1111
}
1212
dependencies {
13-
classpath("com.android.tools.build:gradle:7.2.1")
13+
classpath("com.android.tools.build:gradle:8.4.1")
1414
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
1515
}
1616
}
@@ -40,15 +40,20 @@ def supportsNamespace() {
4040
}
4141

4242
android {
43-
compileSdkVersion safeExtGet('compileSdkVersion', 33)
43+
compileSdkVersion safeExtGet('compileSdkVersion', 35)
4444

4545
if (supportsNamespace()) {
4646
namespace "com.retyui.widgetpicker"
47+
sourceSets {
48+
main {
49+
manifest.srcFile "src/main/AndroidManifestNew.xml"
50+
}
51+
}
4752
}
4853

4954
defaultConfig {
50-
minSdkVersion safeExtGet('minSdkVersion', 21)
51-
targetSdkVersion safeExtGet('targetSdkVersion', 33)
55+
minSdkVersion safeExtGet('minSdkVersion', 24)
56+
targetSdkVersion safeExtGet('targetSdkVersion', 34)
5257
buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
5358
}
5459

@@ -91,7 +96,7 @@ repositories {
9196

9297
apply from: "$projectDir/react-native-helpers.gradle"
9398

94-
def kotlin_ver = safeExtGet('kotlinVersion', '1.7.0')
99+
def kotlin_ver = safeExtGet('kotlinVersion', '2.1.20')
95100

96101
dependencies {
97102
if (project.ext.shouldConsumeReactNativeFromMavenCentral()) {
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
2+
</manifest>

package.json

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"name": "react-native-widget-picker",
3-
"version": "1.0.3",
3+
"version": "1.1.0",
44
"license": "MIT",
55
"main": "dist/cjs",
66
"module": "dist/mjs",
77
"react-native": "src",
88
"source": "src",
99
"peerDependencies": {
1010
"react": ">=16.4.0",
11-
"react-native": ">=0.65.0"
11+
"react-native": ">=0.72.0"
1212
},
1313
"peerDependenciesMeta": {
1414
"react": {
@@ -32,8 +32,6 @@
3232
"dist",
3333
"src",
3434
"android",
35-
"ios",
36-
"WidgetPicker.podspec",
3735
"!android/build",
3836
"!ios/build",
3937
"!**/__tests__",
@@ -42,15 +40,15 @@
4240
],
4341
"codegenConfig": {
4442
"name": "WidgetPicker",
45-
"type": "all",
43+
"type": "modules",
4644
"jsSrcsDir": "src",
4745
"android": {
4846
"javaPackageName": "com.retyui.widgetpicker"
4947
}
5048
},
5149
"devDependencies": {
52-
"react-native": "^0.72.3",
53-
"typescript": "^5.1.6"
50+
"react-native": "^0.80.2",
51+
"typescript": "^5.9.2"
5452
},
5553
"keywords": [
5654
"react",

0 commit comments

Comments
 (0)