Skip to content

Commit 6e1ef16

Browse files
committed
Externalized former submodules
1 parent 20e844f commit 6e1ef16

12 files changed

+17
-30
lines changed

.gitmodules

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

.idea/vcs.xml

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

buildsystem/dependencies.gradle

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
Action<InclusiveRepositoryContentDescriptor> jitpackFilterConfigurationAction = { filter ->
22
filter.includeModule('com.github.solkin', 'disk-lru-cache')
3+
filter.includeModule('com.github.cryptomator', 'subsampling-scale-image-view')
4+
filter.includeModule('com.github.cryptomator.pcloud-sdk-java', 'java-core')
5+
filter.includeModule('com.github.cryptomator.google-http-java-client', 'google-http-client-parent') //Required by com.github.cryptomator.google-http-java-client:*
6+
filter.includeModule('com.github.cryptomator.google-http-java-client', 'google-http-client')
7+
filter.includeModule('com.github.cryptomator.google-http-java-client', 'google-http-client-android')
38
}
49

510
allprojects {
@@ -68,7 +73,7 @@ ext {
6873

6974
zxcvbnVersion = '1.7.0'
7075

71-
scaleImageViewVersion = '3.10.0'
76+
scaleImageViewVersion = '3.10.1-dev.0002'
7277

7378
lruFileCacheVersion = '1.2'
7479

@@ -83,16 +88,13 @@ ext {
8388
googleApiServicesVersion = 'v3-rev20220508-1.32.1'
8489
googlePlayServicesVersion = '19.2.0'
8590
googleClientVersion = '2.2.0' // keep in sync with https://github.com/cryptomator/google-http-java-client
86-
/*
87-
update using https://github.com/cryptomator/google-http-java-client with `mvn clean install`,
88-
copying `google-http-client-*.jar` and `google-http-client-android-*.jar` into the lib folder of this project
89-
*/
90-
trackingFreeGoogleCLientVersion = '1.43.0'
91+
trackingFreeGoogleCLientVersion = '1.44.2-dev.0001'
9192

9293
msgraphVersion = '5.47.0'
9394
msgraphAuthVersion = '4.0.5' // contains com.microsoft.identity:common lib which added opentelemetry in 9.0.0, do we need to fork another lib before updating to >=4.2.0 ???
9495

9596
minIoVersion = '8.5.2'
97+
pcloudVersion = '1.9.2-dev.0001'
9698
staxVersion = '1.2.0' // needed for minIO
9799

98100
commonsCodecVersion = '1.15'
@@ -154,8 +156,8 @@ ext {
154156
googleApiClientAndroid : "com.google.api-client:google-api-client-android:${googleClientVersion}",
155157
googleApiServicesDrive : "com.google.apis:google-api-services-drive:${googleApiServicesVersion}",
156158
googlePlayServicesAuth : "com.google.android.gms:play-services-auth:${googlePlayServicesVersion}",
157-
trackingFreeGoogleCLient : files("lib/google-http-client-${trackingFreeGoogleCLientVersion}.jar"),
158-
trackingFreeGoogleAndroidCLient: files("lib/google-http-client-android-${trackingFreeGoogleCLientVersion}.jar"),
159+
trackingFreeGoogleCLient : "com.github.cryptomator.google-http-java-client:google-http-client:${trackingFreeGoogleCLientVersion}",
160+
trackingFreeGoogleAndroidCLient: "com.github.cryptomator.google-http-java-client:google-http-client-android:${trackingFreeGoogleCLientVersion}",
159161
greenDao : "org.greenrobot:greendao:${greenDaoVersion}",
160162
gson : "com.google.code.gson:gson:${gsonVersion}",
161163
hamcrest : "org.hamcrest:hamcrest-all:${hamcrestVersion}",
@@ -174,6 +176,7 @@ ext {
174176
multidex : "androidx.multidex:multidex:${multidexVersion}",
175177
okHttp : "com.squareup.okhttp3:okhttp:${okHttpVersion}",
176178
okHttpDigest : "io.github.rburgst:okhttp-digest:${okHttpDigestVersion}",
179+
pcloud : "com.github.cryptomator.pcloud-sdk-java:java-core:${pcloudVersion}",
177180
recyclerViewFastScroll : "com.simplecityapps:recyclerview-fastscroll:${recyclerViewFastScrollVersion}",
178181
rxJava : "io.reactivex.rxjava2:rxjava:${rxJavaVersion}",
179182
rxAndroid : "io.reactivex.rxjava2:rxandroid:${rxAndroidVersion}",
@@ -187,7 +190,7 @@ ext {
187190
contribution : "androidx.test.espresso:espresso-contrib:${contributionVersion}",
188191
uiAutomator : "androidx.test.uiautomator:uiautomator:${uiautomatorVersion}",
189192
zxcvbn : "com.nulab-inc:zxcvbn:${zxcvbnVersion}",
190-
scaleImageView : "com.davemorrissey.labs:subsampling-scale-image-view:${scaleImageViewVersion}",
193+
scaleImageView : "com.github.cryptomator:subsampling-scale-image-view:${scaleImageViewVersion}",
191194
lruFileCache : "com.github.solkin:disk-lru-cache:${lruFileCacheVersion}",
192195
jsonWebTokenApi : "io.jsonwebtoken:jjwt-api:${jsonWebTokenApiVersion}",
193196
jsonWebTokenImpl : "io.jsonwebtoken:jjwt-impl:${jsonWebTokenApiVersion}",

data/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,9 @@ dependencies {
103103

104104
implementation project(':domain')
105105
implementation project(':util')
106-
playstoreImplementation project(':pcloud-sdk-java')
107-
apkstoreImplementation project(':pcloud-sdk-java')
108-
fdroidImplementation project(':pcloud-sdk-java')
106+
playstoreImplementation dependencies.pcloud
107+
apkstoreImplementation dependencies.pcloud
108+
fdroidImplementation dependencies.pcloud
109109

110110
coreLibraryDesugaring dependencies.coreDesugaring
111111

-273 KB
Binary file not shown.

lib/google-http-client-1.43.0.jar

-280 KB
Binary file not shown.
-14.2 KB
Binary file not shown.
-16.7 KB
Binary file not shown.

lib/pcloud-sdk-java

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

lib/subsampling-scale-image-view

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

0 commit comments

Comments
 (0)