AtaraxiaDev/cryptomator-android
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Revert "Add S3 as module dependency"

Browse Source 
This reverts commit 34b69805932fc12f526893932a7bca4a6aeddbf5.
This commit is contained in:
Julian Raufelder 2021-04-28 16:01:03 +02:00 committed by Manuel Jenny
parent 4f97a0d8d8
commit 91a0c2e5d3
No known key found for this signature in database
GPG Key ID: 1C80FE62B2BEAA18
6 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -7,6 +7,3 @@
[submodule "pcloud-sdk-java"] [submodule "pcloud-sdk-java"]
path = pcloud-sdk-java path = pcloud-sdk-java
url = https://github.com/SailReal/pcloud-sdk-java url = https://github.com/SailReal/pcloud-sdk-java
[submodule "aws-sdk-android"]
path = aws-sdk-android
url = https://github.com/SailReal/aws-sdk-android.git

1
.idea/vcs.xml generated
View File

@ -2,7 +2,6 @@
<project version="4"> <project version="4">
<component name="VcsDirectoryMappings"> <component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" /> <mapping directory="" vcs="Git" />
<mapping directory="$PROJECT_DIR$/aws-sdk-android" vcs="Git" />
<mapping directory="$PROJECT_DIR$/msa-auth-for-android" vcs="Git" /> <mapping directory="$PROJECT_DIR$/msa-auth-for-android" vcs="Git" />
<mapping directory="$PROJECT_DIR$/pcloud-sdk-java" vcs="Git" /> <mapping directory="$PROJECT_DIR$/pcloud-sdk-java" vcs="Git" />
<mapping directory="$PROJECT_DIR$/subsampling-scale-image-view" vcs="Git" /> <mapping directory="$PROJECT_DIR$/subsampling-scale-image-view" vcs="Git" />

1
aws-sdk-android

@ -1 +0,0 @@
Subproject commit 5383caff6e352936a638491b941b02e17c6b593a

4
buildsystem/dependencies.gradle
View File

@ -51,6 +51,9 @@ ext {
// do not update to 1.4.0 until minsdk is 7.x (or desugaring works better) otherwise it will crash on 6.x // do not update to 1.4.0 until minsdk is 7.x (or desugaring works better) otherwise it will crash on 6.x
cryptolibVersion = '1.3.0' cryptolibVersion = '1.3.0'
awsAndroidSdkS3 = '2.22.6'
awsS3Sdk = '1.11.999'
dropboxVersion = '4.0.0' dropboxVersion = '4.0.0'
googleApiServicesVersion = 'v3-rev197-1.25.0' googleApiServicesVersion = 'v3-rev197-1.25.0'
@ -101,6 +104,7 @@ ext {
androidxViewpager : "androidx.viewpager:viewpager:${androidxViewpagerVersion}", androidxViewpager : "androidx.viewpager:viewpager:${androidxViewpagerVersion}",
androidxSwiperefresh : "androidx.swiperefreshlayout:swiperefreshlayout:${androidxSwiperefreshVersion}", androidxSwiperefresh : "androidx.swiperefreshlayout:swiperefreshlayout:${androidxSwiperefreshVersion}",
androidxPreference : "androidx.preference:preference:${androidxPreferenceVersion}", androidxPreference : "androidx.preference:preference:${androidxPreferenceVersion}",
awsAndroidS3 : "com.amazonaws:aws-android-sdk-s3:${awsAndroidSdkS3}",
documentFile : "androidx.documentfile:documentfile:${androidxDocumentfileVersion}", documentFile : "androidx.documentfile:documentfile:${androidxDocumentfileVersion}",
recyclerView : "androidx.recyclerview:recyclerview:${androidxRecyclerViewVersion}", recyclerView : "androidx.recyclerview:recyclerview:${androidxRecyclerViewVersion}",
androidxTestCore : "androidx.test:core:${androidxTestCoreVersion}", androidxTestCore : "androidx.test:core:${androidxTestCoreVersion}",

2
data/build.gradle
View File

@ -89,7 +89,6 @@ dependencies {
implementation project(':util') implementation project(':util')
implementation project(':msa-auth-for-android') implementation project(':msa-auth-for-android')
implementation project(':pcloud-sdk-java') implementation project(':pcloud-sdk-java')
implementation project(':aws-android-sdk-s3')
// cryptomator // cryptomator
implementation dependencies.cryptolib implementation dependencies.cryptolib
@ -100,6 +99,7 @@ dependencies {
annotationProcessor dependencies.daggerCompiler annotationProcessor dependencies.daggerCompiler
implementation dependencies.dagger implementation dependencies.dagger
// cloud // cloud
implementation dependencies.awsAndroidS3
implementation dependencies.dropbox implementation dependencies.dropbox
implementation dependencies.msgraph implementation dependencies.msgraph

9
settings.gradle
View File

@ -1,12 +1,5 @@
include ':generator', ':presentation', ':generator-api', ':domain', ':data', ':util', ':subsampling-image-view', ':msa-auth-for-android', ':pcloud-sdk-java-root', ':pcloud-sdk-java', ':pcloud-sdk-android', 'aws-sdk-android', ':aws-android-sdk-s3', ':aws-android-sdk-core', ':aws-android-sdk-kms' include ':generator', ':presentation', ':generator-api', ':domain', ':data', ':util', ':subsampling-image-view', ':msa-auth-for-android', ':pcloud-sdk-java-root', ':pcloud-sdk-java', ':pcloud-sdk-android'
project(':subsampling-image-view').projectDir = file(new File(rootDir, 'subsampling-scale-image-view/library')) project(':subsampling-image-view').projectDir = file(new File(rootDir, 'subsampling-scale-image-view/library'))
project(':pcloud-sdk-java-root').projectDir = file(new File(rootDir, 'pcloud-sdk-java')) project(':pcloud-sdk-java-root').projectDir = file(new File(rootDir, 'pcloud-sdk-java'))
project(':pcloud-sdk-java').projectDir = file(new File(rootDir, 'pcloud-sdk-java/java-core')) project(':pcloud-sdk-java').projectDir = file(new File(rootDir, 'pcloud-sdk-java/java-core'))
project(':pcloud-sdk-android').projectDir = file(new File(rootDir, 'pcloud-sdk-java/android')) project(':pcloud-sdk-android').projectDir = file(new File(rootDir, 'pcloud-sdk-java/android'))
project(':aws-sdk-android').projectDir = file(new File(rootDir, 'aws-sdk-android'))
project(':aws-android-sdk-core').projectDir = file(new File(rootDir, 'aws-sdk-android/aws-android-sdk-core'))
project(':aws-android-sdk-kms').projectDir = file(new File(rootDir, 'aws-sdk-android/aws-android-sdk-kms'))
project(':aws-android-sdk-s3').projectDir = file(new File(rootDir, 'aws-sdk-android/aws-android-sdk-s3'))