Skip to content

Commit 415ef7c

Browse files
committed
chore: update rn version
1 parent 5856268 commit 415ef7c

File tree

41 files changed

+1837
-3110
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+1837
-3110
lines changed

example/.gitattributes

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
*.pbxproj -text
1+
# Windows files should use crlf line endings
2+
# https://help.github.com/articles/dealing-with-line-endings/
3+
*.bat text eol=crlf

example/.gitignore

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
#
33
.DS_Store
44

5-
*.binlog
6-
75
# Xcode
86
#
97
build/
@@ -22,7 +20,6 @@ DerivedData
2220
*.hmap
2321
*.ipa
2422
*.xcuserstate
25-
project.xcworkspace
2623

2724
# Android/IntelliJ
2825
#
@@ -42,6 +39,7 @@ yarn-error.log
4239
buck-out/
4340
\.buckd/
4441
*.keystore
42+
!debug.keystore
4543

4644
# fastlane
4745
#
@@ -56,3 +54,6 @@ buck-out/
5654

5755
# Bundle artifact
5856
*.jsbundle
57+
58+
# CocoaPods
59+
/ios/Pods/

example/App.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export class App extends React.Component<Props, State> {
3333
/* $FlowFixMe(>=0.85.0 site=react_native_fb) This comment suppresses an error
3434
* found when Flow v0.85 was deployed. To see the error, delete this comment
3535
* and run Flow. */
36-
getProgress = (offset) => {
36+
getProgress = offset => {
3737
const progress = this.state.progress + offset;
3838
return Math.sin(progress % Math.PI) % 1;
3939
};

example/android/app/BUCK

Lines changed: 0 additions & 55 deletions
This file was deleted.

example/android/app/build.gradle

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import com.android.build.OutputFile
99
* cycle. By default, bundleDebugJsAndAssets is skipped, as in debug/dev mode we prefer to load the
1010
* bundle directly from the development server. Below you can see all the possible configurations
1111
* and their defaults. If you decide to add a configuration block, make sure to add it before the
12-
* `apply from: "../../../node_modules/react-native/react.gradle"` line.
12+
* `apply from: "../../node_modules/react-native/react.gradle"` line.
1313
*
1414
* project.ext.react = [
1515
* // the name of the generated asset file containing your JS bundle
@@ -46,7 +46,7 @@ import com.android.build.OutputFile
4646
* // 'devDisabledIn${buildType}'
4747
*
4848
* // the root of your project, i.e. where "package.json" lives
49-
* root: "../../../",
49+
* root: "../../",
5050
*
5151
* // where to put the JS bundle asset in debug mode
5252
* jsBundleDirDebug: "$buildDir/intermediates/assets/debug",
@@ -121,6 +121,8 @@ def jscFlavor = 'org.webkit:android-jsc:+'
121121
def enableHermes = project.ext.react.get("enableHermes", false);
122122

123123
android {
124+
ndkVersion rootProject.ext.ndkVersion
125+
124126
compileSdkVersion rootProject.ext.compileSdkVersion
125127

126128
compileOptions {
@@ -129,7 +131,7 @@ android {
129131
}
130132

131133
defaultConfig {
132-
applicationId "com.progressviewexample"
134+
applicationId "com.example"
133135
minSdkVersion rootProject.ext.minSdkVersion
134136
targetSdkVersion rootProject.ext.targetSdkVersion
135137
versionCode 1
@@ -169,11 +171,12 @@ android {
169171
variant.outputs.each { output ->
170172
// For each separate APK per architecture, set a unique version code as described here:
171173
// https://developer.android.com/studio/build/configure-apk-splits.html
174+
// Example: versionCode 1 will generate 1001 for armeabi-v7a, 1002 for x86, etc.
172175
def versionCodes = ["armeabi-v7a": 1, "x86": 2, "arm64-v8a": 3, "x86_64": 4]
173176
def abi = output.getFilter(OutputFile.ABI)
174177
if (abi != null) { // null for the universal-debug, universal-release variants
175178
output.versionCodeOverride =
176-
versionCodes.get(abi) * 1048576 + defaultConfig.versionCode
179+
defaultConfig.versionCode * 1000 + versionCodes.get(abi)
177180
}
178181

179182
}
@@ -184,15 +187,16 @@ dependencies {
184187
implementation fileTree(dir: "libs", include: ["*.jar"])
185188
//noinspection GradleDynamicVersion
186189
implementation "com.facebook.react:react-native:+" // From node_modules
190+
187191
implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
188-
189192

190193
debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") {
191194
exclude group:'com.facebook.fbjni'
192195
}
193196

194197
debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
195198
exclude group:'com.facebook.flipper'
199+
exclude group:'com.squareup.okhttp3', module:'okhttp'
196200
}
197201

198202
debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}") {
@@ -206,6 +210,9 @@ dependencies {
206210
} else {
207211
implementation jscFlavor
208212
}
213+
214+
// used for example
215+
implementation project(':progressview')
209216
}
210217

211218
// Run this once to be able to run the application with BUCK

example/android/app/proguard-rules.pro

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,3 @@
88
# http://developer.android.com/guide/developing/tools/proguard.html
99

1010
# Add any project specific keep options here:
11-
12-
# If your project uses WebView with JS, uncomment the following
13-
# and specify the fully qualified class name to the JavaScript interface
14-
# class:
15-
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
16-
# public *;
17-
#}

example/android/app/src/debug/AndroidManifest.xml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,10 @@
44

55
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
66

7-
<application android:usesCleartextTraffic="true" tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning" />
8-
</manifest>
7+
<application
8+
android:usesCleartextTraffic="true"
9+
tools:targetApi="28"
10+
tools:ignore="GoogleAppIndexingWarning">
11+
<activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
12+
</application>
13+
</manifest>

example/android/app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.progressviewexample">
2+
package="com.example">
33

44
<uses-permission android:name="android.permission.INTERNET" />
55

@@ -21,7 +21,5 @@
2121
<category android:name="android.intent.category.LAUNCHER" />
2222
</intent-filter>
2323
</activity>
24-
<activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
2524
</application>
26-
2725
</manifest>

example/android/app/src/main/java/com/progressviewexample/MainActivity.java

Lines changed: 0 additions & 15 deletions
This file was deleted.

example/android/app/src/main/java/com/progressviewexample/MainApplication.java

Lines changed: 0 additions & 80 deletions
This file was deleted.

0 commit comments

Comments
 (0)