Skip to content

Commit 2eda2be

Browse files
committed
rebuild example app with latest React Native version
1 parent 95dd25c commit 2eda2be

Some content is hidden

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

53 files changed

+4111
-3735
lines changed

android/libs/adjust-android.jar

5.65 KB
Binary file not shown.

android/src/main/java/com/adjust/sdk/Adjust.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -669,10 +669,10 @@ public void setTestOptions(ReadableMap mapTest) {
669669
String value = mapTest.getString("subscriptionPath");
670670
testOptions.subscriptionPath = value;
671671
}
672-
if (checkKey(mapTest, "useTestConnectionOptions")) {
673-
boolean value = mapTest.getBoolean("useTestConnectionOptions");
674-
testOptions.useTestConnectionOptions = value;
675-
}
672+
// if (checkKey(mapTest, "useTestConnectionOptions")) {
673+
// boolean value = mapTest.getBoolean("useTestConnectionOptions");
674+
// testOptions.useTestConnectionOptions = value;
675+
// }
676676
if (checkKey(mapTest, "timerIntervalInMilliseconds")) {
677677
try {
678678
Long value = Long.parseLong(mapTest.getString("timerIntervalInMilliseconds"));

example/.eslintrc.js

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

example/.flowconfig

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

example/.gitignore

Lines changed: 76 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ DerivedData
2020
*.hmap
2121
*.ipa
2222
*.xcuserstate
23+
project.xcworkspace
2324

2425
# Android/IntelliJ
2526
#
@@ -52,8 +53,82 @@ buck-out/
5253
*/fastlane/Preview.html
5354
*/fastlane/screenshots
5455

55-
# Bundle artifact
56+
# Bundle artifacts
5657
*.jsbundle
5758

5859
# CocoaPods
5960
/ios/Pods/
61+
62+
# Expo
63+
.expo/*
64+
web-build/
65+
66+
# @generated expo-cli sync-28e2ab0e9ece60556eaf932abe52d017ec33db50
67+
# The following patterns were generated by expo-cli
68+
69+
# OSX
70+
#
71+
.DS_Store
72+
73+
# Xcode
74+
#
75+
build/
76+
*.pbxuser
77+
!default.pbxuser
78+
*.mode1v3
79+
!default.mode1v3
80+
*.mode2v3
81+
!default.mode2v3
82+
*.perspectivev3
83+
!default.perspectivev3
84+
xcuserdata
85+
*.xccheckout
86+
*.moved-aside
87+
DerivedData
88+
*.hmap
89+
*.ipa
90+
*.xcuserstate
91+
project.xcworkspace
92+
93+
# Android/IntelliJ
94+
#
95+
build/
96+
.idea
97+
.gradle
98+
local.properties
99+
*.iml
100+
101+
# node.js
102+
#
103+
node_modules/
104+
npm-debug.log
105+
yarn-error.log
106+
107+
# BUCK
108+
buck-out/
109+
\.buckd/
110+
*.keystore
111+
!debug.keystore
112+
113+
# fastlane
114+
#
115+
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
116+
# screenshots whenever they are needed.
117+
# For more information about the recommended setup visit:
118+
# https://docs.fastlane.tools/best-practices/source-control/
119+
120+
*/fastlane/report.xml
121+
*/fastlane/Preview.html
122+
*/fastlane/screenshots
123+
124+
# Bundle artifacts
125+
*.jsbundle
126+
127+
# CocoaPods
128+
/ios/Pods/
129+
130+
# Expo
131+
.expo/*
132+
web-build/
133+
134+
# @end expo-cli

example/.prettierrc.js

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

example/.watchmanconfig

Lines changed: 0 additions & 1 deletion
This file was deleted.

example/__tests__/App-test.js renamed to example/__tests__/App.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
/**
2-
* @format
3-
*/
4-
51
import 'react-native';
62
import React from 'react';
73
import App from '../App';

example/android/app/build.gradle

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import com.android.build.OutputFile
2020
* // default. Can be overridden with ENTRY_FILE environment variable.
2121
* entryFile: "index.android.js",
2222
*
23-
* // https://facebook.github.io/react-native/docs/performance#enable-the-ram-format
23+
* // https://reactnative.dev/docs/performance#enable-the-ram-format
2424
* bundleCommand: "ram-bundle",
2525
*
2626
* // whether to bundle JS and assets in debug mode
@@ -78,10 +78,13 @@ import com.android.build.OutputFile
7878
*/
7979

8080
project.ext.react = [
81-
enableHermes: false, // clean and rebuild if changing
81+
enableHermes: false
8282
]
8383

84+
apply from: '../../node_modules/react-native-unimodules/gradle.groovy'
8485
apply from: "../../node_modules/react-native/react.gradle"
86+
apply from: "../../node_modules/expo-constants/scripts/get-app-config-android.gradle"
87+
apply from: "../../node_modules/expo-updates/scripts/create-manifest-android.gradle"
8588

8689
/**
8790
* Set this to true to create two separate APKs instead of one:
@@ -129,11 +132,11 @@ android {
129132
}
130133

131134
defaultConfig {
132-
applicationId "com.adjust.examples"
135+
applicationId 'com.adjust.examples'
133136
minSdkVersion rootProject.ext.minSdkVersion
134137
targetSdkVersion rootProject.ext.targetSdkVersion
135138
versionCode 1
136-
versionName "4.23.1"
139+
versionName "1.0.0"
137140
}
138141
splits {
139142
abi {
@@ -157,20 +160,13 @@ android {
157160
}
158161
release {
159162
// Caution! In production, you need to generate your own keystore file.
160-
// see https://facebook.github.io/react-native/docs/signed-apk-android.
163+
// see https://reactnative.dev/docs/signed-apk-android.
161164
signingConfig signingConfigs.debug
162165
minifyEnabled enableProguardInReleaseBuilds
163166
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
164167
}
165168
}
166169

167-
packagingOptions {
168-
pickFirst "lib/armeabi-v7a/libc++_shared.so"
169-
pickFirst "lib/arm64-v8a/libc++_shared.so"
170-
pickFirst "lib/x86/libc++_shared.so"
171-
pickFirst "lib/x86_64/libc++_shared.so"
172-
}
173-
174170
// applicationVariants are e.g. debug, release
175171
applicationVariants.all { variant ->
176172
variant.outputs.each { output ->
@@ -191,20 +187,18 @@ dependencies {
191187
implementation fileTree(dir: "libs", include: ["*.jar"])
192188
//noinspection GradleDynamicVersion
193189
implementation "com.facebook.react:react-native:+" // From node_modules
194-
195190
implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
196-
197191
debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") {
198192
exclude group:'com.facebook.fbjni'
199193
}
200-
201194
debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
202195
exclude group:'com.facebook.flipper'
196+
exclude group:'com.squareup.okhttp3', module:'okhttp'
203197
}
204-
205198
debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}") {
206199
exclude group:'com.facebook.flipper'
207200
}
201+
addUnimodulesDependencies()
208202

209203
if (enableHermes) {
210204
def hermesPath = "../../node_modules/hermes-engine/android/";
@@ -213,9 +207,6 @@ dependencies {
213207
} else {
214208
implementation jscFlavor
215209
}
216-
217-
implementation 'com.android.installreferrer:installreferrer:1.1.2'
218-
implementation 'com.google.android.gms:play-services-ads-identifier:17.0.0'
219210
}
220211

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

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
<?xml version="1.0" encoding="utf-8"?>
21
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
32
xmlns:tools="http://schemas.android.com/tools">
43

0 commit comments

Comments
 (0)