@@ -19,16 +19,9 @@ def reactNativeArchitectures() {
19
19
return value ? value. split(" ," ) : [" armeabi-v7a" , " x86" , " x86_64" , " arm64-v8a" ]
20
20
}
21
21
22
- def isNewArchitectureEnabled () {
23
- return rootProject. hasProperty(" newArchEnabled" ) && rootProject. getProperty(" newArchEnabled" ) == " true"
24
- }
25
-
26
22
apply plugin : " com.android.library"
27
23
apply plugin : " kotlin-android"
28
-
29
- if (isNewArchitectureEnabled()) {
30
- apply plugin : " com.facebook.react"
31
- }
24
+ apply plugin : " com.facebook.react"
32
25
33
26
def getExtOrDefault (name ) {
34
27
return rootProject. ext. has(name) ? rootProject. ext. get(name) : project. properties[" RNTSketchCanvas_" + name]
@@ -38,32 +31,15 @@ def getExtOrIntegerDefault(name) {
38
31
return rootProject. ext. has(name) ? rootProject. ext. get(name) : (project. properties[" RNTSketchCanvas_" + name]). toInteger()
39
32
}
40
33
41
- def supportsNamespace () {
42
- def parsed = com.android.Version . ANDROID_GRADLE_PLUGIN_VERSION . tokenize(' .' )
43
- def major = parsed[0 ]. toInteger()
44
- def minor = parsed[1 ]. toInteger()
45
-
46
- // Namespace support was added in 7.3.0
47
- return (major == 7 && minor >= 3 ) || major >= 8
48
- }
49
-
50
34
android {
51
- if (supportsNamespace()) {
52
- namespace " com.sourcetoad.reactnativesketchcanvas"
53
-
54
- sourceSets {
55
- main {
56
- manifest. srcFile " src/main/AndroidManifestNew.xml"
57
- }
58
- }
59
- }
35
+ namespace " com.sourcetoad.reactnativesketchcanvas"
60
36
61
37
compileSdkVersion getExtOrIntegerDefault(" compileSdkVersion" )
62
38
63
39
defaultConfig {
64
40
minSdkVersion getExtOrIntegerDefault(" minSdkVersion" )
65
41
targetSdkVersion getExtOrIntegerDefault(" targetSdkVersion" )
66
- buildConfigField " boolean" , " IS_NEW_ARCHITECTURE_ENABLED" , isNewArchitectureEnabled() . toString()
42
+ buildConfigField " boolean" , " IS_NEW_ARCHITECTURE_ENABLED" , " true "
67
43
68
44
}
69
45
@@ -88,12 +64,10 @@ android {
88
64
89
65
sourceSets {
90
66
main {
91
- if (isNewArchitectureEnabled()) {
92
- java. srcDirs + = [
93
- " generated/java" ,
94
- " generated/jni"
95
- ]
96
- }
67
+ java. srcDirs + = [
68
+ " generated/java" ,
69
+ " generated/jni"
70
+ ]
97
71
}
98
72
}
99
73
}
@@ -114,10 +88,8 @@ dependencies {
114
88
implementation ' androidx.exifinterface:exifinterface:1.3.6'
115
89
}
116
90
117
- if (isNewArchitectureEnabled()) {
118
- react {
119
- jsRootDir = file(" ../src/" )
120
- libraryName = " RNTSketchCanvasView"
121
- codegenJavaPackageName = " com.sourcetoad.reactnativesketchcanvas"
122
- }
91
+ react {
92
+ jsRootDir = file(" ../src/" )
93
+ libraryName = " RNTSketchCanvasView"
94
+ codegenJavaPackageName = " com.sourcetoad.reactnativesketchcanvas"
123
95
}
0 commit comments