Skip to content

Commit 387fa2f

Browse files
committed
trying out lots of things
1 parent 0d12f64 commit 387fa2f

File tree

5 files changed

+8
-7
lines changed

5 files changed

+8
-7
lines changed

measure/android/app/build.gradle

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,12 @@ apply plugin: "com.android.application"
33
apply from: "$rootDir/../node_modules/react-native/react.gradle"
44

55
android {
6-
compileSdkVersion 27
7-
buildToolsVersion "27.0.3"
6+
compileSdkVersion 28
87

98
defaultConfig {
109
applicationId "com.javascriptcore.profiler"
1110
minSdkVersion 21
12-
targetSdkVersion 27
11+
targetSdkVersion 28
1312
versionCode 1
1413
versionName "1.0"
1514
ndk {
@@ -35,6 +34,6 @@ android {
3534

3635
dependencies {
3736
implementation fileTree(dir: "libs", include: ["*.jar"])
38-
implementation "com.android.support:appcompat-v7:27.1.1"
37+
implementation "com.android.support:appcompat-v7:28.0.0"
3938
implementation "com.facebook.react:react-native:+" // From node_modules
4039
}

measure/android/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,11 @@ ext {
77

88
def i18nProp = project.findProperty("i18n")
99
JSC_NAME = Boolean.valueOf(i18nProp) ? "android-jsc-intl" : "android-jsc"
10+
11+
isIDE = System.getProperties()['idea.platform.prefix'] != null
1012
}
1113

12-
if (JSC_VERSION) {
14+
if (!isIDE && JSC_VERSION) {
1315
println "\n\n\t\tUsing JavaScriptCore for Android, version ${(char) 27}[35m${JSC_NAME}:${JSC_VERSION}${(char) 27}[0m \n\n"
1416

1517
allprojects {
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

measure/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@
1919
"devDependencies": {
2020
"shell-utils": "1.x.x"
2121
}
22-
}
22+
}

0 commit comments

Comments
 (0)