Skip to content

Commit bf975be

Browse files
committed
3.2.2420
1 parent c99561c commit bf975be

File tree

55 files changed

+7696
-3449
lines changed

Some content is hidden

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

55 files changed

+7696
-3449
lines changed

androidfsstorage/app/build.gradle

Lines changed: 50 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,81 @@
1+
plugins {
2+
id "com.moowork.node" version "1.2.0"
3+
}
14
apply plugin: 'com.android.application'
25
apply plugin: 'ru.tinkoff.gradle.jarjar'
36

47
android {
5-
compileSdkVersion 26
6-
buildToolsVersion "26.0.2"
8+
compileSdkVersion 27
79
defaultConfig {
810
applicationId "com.ithit.webdav.samples.androidfsstorage"
911
minSdkVersion 19
10-
targetSdkVersion 26
12+
targetSdkVersion 27
1113
versionCode 1
1214
versionName "1.0"
1315
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
1416
}
1517
buildTypes {
1618
release {
17-
minifyEnabled false
19+
minifyEnabled true
1820
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
1921
}
2022
}
23+
applicationVariants.all { variant ->
24+
variant.mergeAssets.doLast {
25+
delete(fileTree(dir: variant.mergeAssets.outputDir, includes: ['**/webdav.client/Help/**', '**/webdav.client/Tests/**']))
26+
}
27+
}
2128
}
2229

2330
jarJar {
2431
rules = [
25-
'stax-api-1.0.1.jar': 'javax.xml.** com.ithit.webdav.xml.@1',
26-
'webdav-server-3.2.2389.jar': 'javax.xml.stream.** com.ithit.webdav.xml.stream.@1'
32+
'stax-api-1.0.1.jar' : 'javax.xml.** com.ithit.webdav.xml.@1',
33+
'webdav-server-3.2.2420.jar': 'javax.xml.stream.** com.ithit.webdav.xml.stream.@1'
2734
]
2835
}
2936

37+
node {
38+
// Version of node to use.
39+
version = '4.6.0'
40+
41+
// Version of npm to use.
42+
npmVersion = '2.15.9'
43+
44+
// Base URL for fetching node distributions (change if you have a mirror).
45+
distBaseUrl = 'https://nodejs.org/dist'
46+
47+
// If true, it will download node using above parameters.
48+
// If false, it will try to use globally installed node.
49+
download = true
50+
51+
// Set the work directory for unpacking node
52+
workDir = file("${project.buildDir}/node")
53+
54+
// Set the work directory for NPM
55+
npmWorkDir = file("${project.buildDir}/npm")
56+
57+
// Set the work directory where node_modules should be located
58+
nodeModulesDir = file("${project.projectDir}/src/main/assets/wwwroot/js")
59+
}
60+
61+
build.dependsOn(npmInstall)
62+
3063
dependencies {
3164

32-
compile fileTree(dir: 'libs', include: ['*.jar'])
33-
compile fileTree(dir: 'build/libs', include: ['*.jar'])
34-
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
65+
implementation fileTree(dir: 'libs', include: ['*.jar'])
66+
implementation fileTree(dir: 'build/libs', include: ['*.jar'])
67+
androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
3568
exclude group: 'com.android.support', module: 'support-annotations'
3669
})
37-
compile 'io.apisense:rhino-android:1.0'
38-
compile 'commons-io:commons-io:2.4'
39-
compile 'com.google.code.gson:gson:2.7'
40-
compile 'com.android.support:appcompat-v7:26.+'
41-
compile ('com.ithit.webdav.integration:android-integration:3.2.2389', {
70+
implementation 'io.apisense:rhino-android:1.0'
71+
implementation 'commons-io:commons-io:2.4'
72+
implementation 'com.google.code.gson:gson:2.7'
73+
implementation 'com.android.support:appcompat-v7:27.1.1'
74+
implementation('com.ithit.webdav.integration:android-integration:3.2.2420', {
4275
exclude group: 'org.nanohttpd', module: 'nanohttpd'
4376
})
44-
compile 'com.android.support.constraint:constraint-layout:1.0.2'
77+
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
4578
jarJar 'stax:stax-api:1.0.1'
46-
jarJar 'com.ithit.webdav:webdav-server:3.2.2389'
47-
testCompile 'junit:junit:4.12'
79+
jarJar 'com.ithit.webdav:webdav-server:3.2.2420'
80+
testImplementation 'junit:junit:4.12'
4881
}

androidfsstorage/app/proguard-rules.pro

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,4 @@
2323
# If you keep the line number information, uncomment this to
2424
# hide the original source file name.
2525
#-renamesourcefileattribute SourceFile
26+
-ignorewarnings

0 commit comments

Comments
 (0)