qwe/keepass2android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

upgrade okhttp3 version to 3.9.0 to fix https://github.com/PhilippC/keepass2android/issues/44

Browse Source
This commit is contained in:
Philipp Crocoll
2017-10-23 10:49:46 +02:00
parent 82fa7eaf9f
commit f34bdd57b3
7 changed files with 5 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/JavaFileStorageBindings/Jars/okhttp-3.4.1.jar
View File

Binary file not shown.

BIN
src/JavaFileStorageBindings/Jars/okhttp-3.9.0.jar Normal file
View File

Binary file not shown.

6
src/JavaFileStorageBindings/JavaFileStorageBindings.csproj
View File

@@ -89,9 +89,6 @@
<Visible>False</Visible>
</XamarinComponentReference>
</ItemGroup>
<ItemGroup>
<EmbeddedReferenceJar Include="Jars\okhttp-3.4.1.jar" />
</ItemGroup>
<ItemGroup>
<EmbeddedReferenceJar Include="Jars\okhttp-digest-1.7.jar" />
</ItemGroup>
@@ -161,4 +158,7 @@
<ItemGroup>
<EmbeddedJar Include="Jars\dropbox-core-sdk-3.0.3.jar" />
</ItemGroup>
<ItemGroup>
<EmbeddedReferenceJar Include="Jars\okhttp-3.9.0.jar" />
</ItemGroup>
</Project>

35
src/java/JavaFileStorage/app/build.gradle
View File

@@ -22,28 +22,14 @@ android {
}
dependencies {
/*
//compile files('libs/google-api-services-drive-v2-rev102-1.16.0-rc')
compile 'com.google.android.gms:play-services:6.5.+'
compile 'com.google.api-client:google-api-client-xml:1.18.0-rc'
compile 'com.google.http-client:google-http-client-gson:1.18.0-rc'
compile 'com.google.api-client:google-api-client-android:1.18.0-rc'
compile 'com.google.apis:google-api-services-drive:v2-rev155-1.19.0'
*/
compile 'com.squareup.okhttp3:okhttp:3.4.1'
compile 'com.squareup.okhttp3:okhttp:3.9.0'
compile 'com.burgstaller:okhttp-digest:1.7'
// compile files('libs/dropbox-android-sdk-1.6.2.jar')
compile 'com.google.android.gms:play-services:4.0.30'
/* compile('com.google.api-client:google-api-client-xml:1.16.0-rc') {
exclude group: 'com.google.android.google-play-services'
}*/
compile 'com.google.http-client:google-http-client-gson:1.16.0-rc'
compile('com.google.api-client:google-api-client-android:1.16.0-rc') {
exclude group: 'com.google.android.google-play-services'
}
compile 'com.google.apis:google-api-services-drive:v2-rev102-1.16.0-rc'
//compile 'com.dropbox.core:dropbox-core-sdk:2.0.1'
//compile group: 'com.dropbox.core', name: 'dropbox-core-sdk', version: '0-SNAPSHOT', changing: true
compile 'com.dropbox.core:dropbox-core-sdk:3.0.3'
//onedrive:
compile('com.onedrive.sdk:onedrive-sdk-android:1.2+') {
@@ -52,22 +38,5 @@ dependencies {
compile 'com.google.code.gson:gson:2.3.1'
compile 'com.microsoft.services.msa:msa-auth:0.8.+'
compile 'com.microsoft.aad:adal:1.1.+'
/* compile 'com.google.http-client:google-http-client-gson:1.20.0'
compile 'com.google.code.gson:gson:2.1'
compile files('libs/commons-logging-1.1.1.jar')
compile files('libs/dropbox-android-sdk-1.6.2.jar')
compile files('libs/google-api-client-1.16.0-rc.jar')
compile files('libs/google-api-client-android-1.16.0-rc.jar')
compile files('libs/google-http-client-1.16.0-rc.jar')
compile files('libs/google-http-client-android-1.16.0-rc.jar')
compile files('libs/google-http-client-jackson-1.16.0-rc.jar')
compile files('libs/google-http-client-jackson2-1.16.0-rc.jar')
compile files('libs/google-oauth-client-1.16.0-rc.jar')
compile files('libs/httpclient-4.0.3.jar')
compile files('libs/httpcore-4.0.1.jar')
compile files('libs/httpmime-4.0.3.jar')
compile files('libs/jackson-core-2.1.3.jar')
compile files('libs/jackson-core-asl-1.9.11.jar')
compile files('libs/json_simple-1.1.jar')
compile files('libs/jsr305-1.3.9.jar')*/
}

BIN
src/java/JavaFileStorage/app/build/outputs/aar/JavaFileStorage-debug.aar
View File

Binary file not shown.

BIN
src/java/JavaFileStorage/app/build/outputs/aar/JavaFileStorage-release.aar
View File

Binary file not shown.

7
src/java/android-filechooser-AS/app/android-filechooser.iml
View File

@@ -77,23 +77,16 @@
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard-rules" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />