Skip to content

Commit

Permalink
feat: update example version
Browse files Browse the repository at this point in the history
  • Loading branch information
Naturalclar committed Oct 6, 2023
1 parent b080661 commit 6c4ac2a
Show file tree
Hide file tree
Showing 16 changed files with 5,728 additions and 5,691 deletions.
1 change: 1 addition & 0 deletions example/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
.gradle/
.idea/
.vs/
.xcode.env
Pods/
build/
dist/
Expand Down
8 changes: 2 additions & 6 deletions example/android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,19 +1,15 @@
buildscript {
def androidTestAppDir = "../node_modules/react-native-test-app/android"
apply(from: "${androidTestAppDir}/dependencies.gradle")
apply(from: "${androidTestAppDir}/test-app-util.gradle")

repositories {
mavenCentral()
google()
}

dependencies {
classpath("com.android.tools.build:gradle:${androidPluginVersion}")

if (isNewArchitectureEnabled(project)) {
classpath("com.facebook.react:react-native-gradle-plugin")
classpath("de.undercouch:gradle-download-task:5.1.2")
getReactNativeDependencies().each { dependency ->
classpath(dependency)
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions example/android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ android.enableJetifier=true

# Version of Flipper to use with React Native. Default value is whatever React
# Native defaults to. To disable Flipper, set it to `false`.
#FLIPPER_VERSION=0.125.0
#FLIPPER_VERSION=0.182.0

# Enable Fabric at runtime.
#USE_FABRIC=1
Expand All @@ -39,7 +39,7 @@ android.enableJetifier=true
#newArchEnabled=true

# Uncomment the line below if building react-native from source
#ANDROID_NDK_VERSION=21.4.7075529
#ANDROID_NDK_VERSION=23.1.7779620

# Version of Kotlin to build against.
#KOTLIN_VERSION=1.7.10
#KOTLIN_VERSION=1.7.22
Binary file modified example/android/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion example/android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
12 changes: 8 additions & 4 deletions example/android/gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
Expand All @@ -80,10 +80,10 @@ do
esac
done

APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

APP_NAME="Gradle"
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
Expand Down Expand Up @@ -143,12 +143,16 @@ fi
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down
1 change: 1 addition & 0 deletions example/android/gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal

set DIRNAME=%~dp0
if "%DIRNAME%"=="" set DIRNAME=.
@rem This is normally unused
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

Expand Down
30 changes: 17 additions & 13 deletions example/app.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,25 @@
"components": [
{
"appKey": "MaskedViewExample",
"displayName": "Base example"
},
{
"appKey": "MaskedViewImageExample",
"displayName": "Image example"
},
{
"appKey": "MaskedViewTextExample",
"displayName": "Text example"
"displayName": "MaskedViewExample"
}
],
"resources": {
"android": ["dist/res", "dist/main.android.jsbundle"],
"ios": ["dist/assets", "dist/main.ios.jsbundle"],
"macos": ["dist/assets", "dist/main.macos.jsbundle"],
"windows": ["dist/assets", "dist/main.windows.bundle"]
"android": [
"dist/res",
"dist/main.android.jsbundle"
],
"ios": [
"dist/assets",
"dist/main.ios.jsbundle"
],
"macos": [
"dist/assets",
"dist/main.macos.jsbundle"
],
"windows": [
"dist/assets",
"dist/main.windows.bundle"
]
}
}
2 changes: 1 addition & 1 deletion example/ios/Podfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require_relative '../node_modules/react-native-test-app/test_app'

use_flipper!
use_flipper! false if ENV['USE_FLIPPER'] == '0'

workspace 'MaskedViewExample.xcworkspace'

Expand Down
Loading

0 comments on commit 6c4ac2a

Please sign in to comment.