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

Remove tracking library included by google-http-java-client (fixes #358)

Browse Source 
By using https://github.com/SailReal/google-http-java-client which removed in 03a2374c31 all (in our case deactivated) tracking stuff.

And move all submodules to the '/lib'-folder
This commit is contained in:
Julian Raufelder 2021-10-01 13:18:48 +02:00
parent 729dcff816
commit 49586ba53f
No known key found for this signature in database
GPG Key ID: 17EE71F6634E381D
11 changed files with 70 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.gitmodules vendored
View File

@ -1,9 +1,9 @@
[submodule "msa-auth-for-android"]
path = msa-auth-for-android
path = lib/msa-auth-for-android
url = https://github.com/SailReal/msa-auth-for-android.git
[submodule "subsampling-scale-image-view"]
path = subsampling-scale-image-view
path = lib/subsampling-scale-image-view
url = https://github.com/SailReal/subsampling-scale-image-view.git
[submodule "pcloud-sdk-java"]
path = pcloud-sdk-java
url = https://github.com/SailReal/pcloud-sdk-java
path = lib/pcloud-sdk-java
url = https://github.com/SailReal/pcloud-sdk-java.git

8
.idea/vcs.xml generated
View File

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

11
buildsystem/dependencies.gradle
View File

@ -54,9 +54,14 @@ ext {
dropboxVersion = '4.0.1'
googleApiServicesVersion = 'v3-rev20210725-1.32.1'
googleApiServicesVersion = 'v3-rev20210919-1.32.1'
googlePlayServicesVersion = '19.2.0'
googleClientVersion = '1.32.1'
googleClientVersion = '1.32.1' // keep in sync with https://github.com/SailReal/google-http-java-client
/*
update using https://github.com/SailReal/google-http-java-client with `mvn clean install`,
copying `google-http-client-*.jar` and `google-http-client-android-*.jar` into the lib folder of this project
*/
trackingFreeGoogleCLientVersion = '1.40.1'
msgraphVersion = '2.10.0'
@ -119,6 +124,8 @@ ext {
googleApiClientAndroid: "com.google.api-client:google-api-client-android:${googleClientVersion}",
googleApiServicesDrive: "com.google.apis:google-api-services-drive:${googleApiServicesVersion}",
googlePlayServicesAuth: "com.google.android.gms:play-services-auth:${googlePlayServicesVersion}",
trackingFreeGoogleCLient : files("lib/google-http-client-${trackingFreeGoogleCLientVersion}.jar"),
trackingFreeGoogleAndroidCLient: files("lib/google-http-client-android-${trackingFreeGoogleCLientVersion}.jar"),
greenDao : "org.greenrobot:greendao:${greenDaoVersion}",
gson : "com.google.code.gson:gson:${gsonVersion}",
hamcrest : "org.hamcrest:hamcrest-all:${hamcrestVersion}",

31
data/build.gradle
View File

@ -120,27 +120,54 @@ dependencies {
implementation dependencies.stax
api dependencies.minIo
playstoreImplementation dependencies.googlePlayServicesAuth
apkstoreImplementation dependencies.googlePlayServicesAuth
playstoreImplementation(dependencies.googlePlayServicesAuth) {
exclude module: 'guava-jdk5'
exclude module: 'httpclient'
exclude module: 'googlehttpclient'
exclude group: "com.google.http-client", module: "google-http-client"
}
apkstoreImplementation(dependencies.googlePlayServicesAuth) {
exclude module: 'guava-jdk5'
exclude module: 'httpclient'
exclude module: "google-http-client"
exclude group: "com.google.http-client", module: "google-http-client"
}
playstoreImplementation(dependencies.googleApiServicesDrive) {
exclude module: 'guava-jdk5'
exclude module: 'httpclient'
exclude module: 'googlehttpclient'
exclude group: "com.google.http-client", module: "google-http-client"
}
apkstoreImplementation(dependencies.googleApiServicesDrive) {
exclude module: 'guava-jdk5'
exclude module: 'httpclient'
exclude module: "google-http-client"
exclude group: "com.google.http-client", module: "google-http-client"
}
playstoreImplementation(dependencies.googleApiClientAndroid) {
exclude module: 'guava-jdk5'
exclude module: 'httpclient'
exclude module: "google-http-client"
exclude module: "jetified-google-http-client"
exclude group: "com.google.http-client", module: "google-http-client"
exclude group: "com.google.http-client", module: "jetified-google-http-client"
}
apkstoreImplementation(dependencies.googleApiClientAndroid) {
exclude module: 'guava-jdk5'
exclude module: 'httpclient'
exclude module: "google-http-client"
exclude module: "jetified-google-http-client"
exclude group: "com.google.http-client", module: "google-http-client"
exclude group: "com.google.http-client", module: "jetified-google-http-client"
}
playstoreImplementation dependencies.trackingFreeGoogleCLient
apkstoreImplementation dependencies.trackingFreeGoogleCLient
playstoreImplementation dependencies.trackingFreeGoogleAndroidCLient
apkstoreImplementation dependencies.trackingFreeGoogleAndroidCLient
// rest
implementation dependencies.rxJava
implementation dependencies.rxAndroid

BIN
lib/google-http-client-1.40.1.jar Normal file
View File

Binary file not shown.

BIN
lib/google-http-client-android-1.40.1.jar Normal file
View File

Binary file not shown.

0
msa-auth-for-android → lib/msa-auth-for-android
View File

0
pcloud-sdk-java → lib/pcloud-sdk-java
View File

0
subsampling-scale-image-view → lib/subsampling-scale-image-view
View File

16
presentation/build.gradle
View File

@ -149,21 +149,37 @@ dependencies {
playstoreImplementation(dependencies.googleApiServicesDrive) {
exclude module: 'guava-jdk5'
exclude module: 'httpclient'
exclude module: 'googlehttpclient'
exclude group: "com.google.http-client", module: "google-http-client"
}
apkstoreImplementation(dependencies.googleApiServicesDrive) {
exclude module: 'guava-jdk5'
exclude module: 'httpclient'
exclude group: "com.google.http-client", module: "google-http-client"
}
playstoreImplementation(dependencies.googleApiClientAndroid) {
exclude module: 'guava-jdk5'
exclude module: 'httpclient'
exclude module: "google-http-client"
exclude module: "jetified-google-http-client"
exclude group: "com.google.http-client", module: "google-http-client"
exclude group: "com.google.http-client", module: "jetified-google-http-client"
}
apkstoreImplementation(dependencies.googleApiClientAndroid) {
exclude module: 'guava-jdk5'
exclude module: 'httpclient'
exclude module: "google-http-client"
exclude module: "jetified-google-http-client"
exclude group: "com.google.http-client", module: "google-http-client"
exclude group: "com.google.http-client", module: "jetified-google-http-client"
}
playstoreImplementation dependencies.trackingFreeGoogleCLient
apkstoreImplementation dependencies.trackingFreeGoogleCLient
playstoreImplementation dependencies.trackingFreeGoogleAndroidCLient
apkstoreImplementation dependencies.trackingFreeGoogleAndroidCLient
// rest
implementation dependencies.rxJava
implementation dependencies.rxAndroid

12
settings.gradle
View File

@ -1,4 +1,8 @@
include ':generator', ':presentation', ':generator-api', ':domain', ':data', ':util', ':subsampling-image-view', ':msa-auth-for-android', ':pcloud-sdk-java-root', ':pcloud-sdk-java'
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').projectDir = file(new File(rootDir, 'pcloud-sdk-java/java-core'))
include ':generator', ':presentation', ':generator-api', ':domain', ':data', ':util', ':msa-auth-for-android', ':pcloud-sdk-java-root', ':pcloud-sdk-java', ':subsampling-image-view'
var libFolder = new File(rootDir, 'lib')
project(':msa-auth-for-android').projectDir = file(new File(libFolder, 'msa-auth-for-android'))
project(':pcloud-sdk-java-root').projectDir = file(new File(libFolder, 'pcloud-sdk-java'))
project(':pcloud-sdk-java').projectDir = file(new File(libFolder, 'pcloud-sdk-java/java-core'))
project(':subsampling-image-view').projectDir = file(new File(libFolder, 'subsampling-scale-image-view/library'))