Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 0 additions & 4 deletions .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@
"matchDatasources": ["maven"],
"matchPackagePrefixes": ["com.squareup.moshi:"]
},
{
"matchPackageNames": ["org.jetbrains.intellij.deps:trove4j"],
"enabled": false
},
{
"matchPackageNames": ["react"],
"enabled": false
Expand Down
5 changes: 4 additions & 1 deletion ReactTestApp-DevSupport.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,10 @@ Pod::Spec.new do |s|
s.dependency 'React-Core'
s.dependency 'React-jsi'

s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' }
s.pod_target_xcconfig = {
'CLANG_CXX_LANGUAGE_STANDARD' => 'c++17',
'DEFINES_MODULE' => 'YES',
}

s.source_files = 'common/AppRegistry.{cpp,h}',
'ios/ReactTestApp/AppRegistryModule.{h,mm}',
Expand Down
5 changes: 4 additions & 1 deletion android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ android {
}

compileSdkVersion project.ext.compileSdkVersion
buildToolsVersion project.ext.buildToolsVersion

// We need only set `ndkVersion` when building react-native from source.
if (hasProperty("ANDROID_NDK_VERSION")) {
Expand Down Expand Up @@ -119,6 +118,10 @@ android {
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

lintOptions {
lintConfig file("lint.xml")
}

packagingOptions {
pickFirst "lib/armeabi-v7a/libc++_shared.so"
pickFirst "lib/arm64-v8a/libc++_shared.so"
Expand Down
6 changes: 6 additions & 0 deletions android/app/lint.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<lint>
<issue id="UnusedResources">
<ignore path="**/generated/rncli/src/main/res/raw/app.json" />
</issue>
</lint>
4 changes: 3 additions & 1 deletion android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@

<activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />

<activity android:name="com.microsoft.reacttestapp.MainActivity">
<activity
android:name="com.microsoft.reacttestapp.MainActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
package com.microsoft.reacttestapp.react

import com.facebook.react.bridge.Arguments
import com.facebook.react.bridge.ReadableArray
import com.facebook.react.bridge.ReadableMap
import com.facebook.react.bridge.WritableArray
import com.facebook.react.bridge.WritableMap

// TODO: Change the return type to `ReadableMap` when RN 0.60 is deprecated
fun Map<*, *>.toReadableMap(): WritableMap {
fun Map<*, *>.toReadableMap(): ReadableMap {
return Arguments.createMap().also { map ->
for ((k, v) in this) {
map.putValue(k as String, v)
Expand Down Expand Up @@ -39,15 +40,13 @@ private fun WritableMap.putValue(key: String, value: Any?) {
}
}

// TODO: Change the return type to `ReadableArray` when RN 0.60 is deprecated
private fun toReadableArray(list: ArrayList<*>): WritableArray {
private fun toReadableArray(list: ArrayList<*>): ReadableArray {
return Arguments.createArray().also { array ->
list.forEach { array.pushValue(it) }
}
}

// TODO: Change the return type to `ReadableMap` when RN 0.60 is deprecated
private fun toReadableMap(obj: Any): WritableMap {
private fun toReadableMap(obj: Any): ReadableMap {
val map = obj as? Map<*, *> ?: throw NotImplementedError(
"Encountered unknown type while parsing manifest: ${obj::class.qualifiedName}"
)
Expand Down
5 changes: 2 additions & 3 deletions android/dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ ext {
]

compileSdkVersion = 31
buildToolsVersion = "30.0.3"
minSdkVersion = 21
minSdkVersion = 23
targetSdkVersion = 29

/**
Expand Down Expand Up @@ -42,6 +41,6 @@ ext {
moshiKotlinCodegen : "com.squareup.moshi:moshi-kotlin-codegen:1.12.0",
]

androidPluginVersion = "4.2.2"
androidPluginVersion = "7.0.4"
kotlinVersion = versionOf(libraries.kotlinStdlibJdk7)
}
13 changes: 0 additions & 13 deletions android/force-resolve-trove4j.gradle

This file was deleted.

2 changes: 1 addition & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading