Skip to content

Commit

Permalink
Merge pull request #1311 from dimagi/enable_certificate_transparency
Browse files Browse the repository at this point in the history
Enable Certificate Transparency
  • Loading branch information
avazirna authored Oct 9, 2023
2 parents 620ba63 + cd09e41 commit 68ce506
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 8 deletions.
10 changes: 5 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ dependencies {
implementation 'joda-time:joda-time:2.12.1'
implementation 'com.carrotsearch:hppc:0.9.1'
api 'com.squareup.retrofit2:retrofit:2.3.0'
api 'com.squareup.okhttp3:okhttp:3.12.12'
api 'com.squareup.okhttp3:okhttp:4.11.0'
implementation 'com.google.code.findbugs:jsr305:3.0.2'
implementation 'io.reactivex.rxjava2:rxjava:2.2.21'
implementation 'com.google.guava:guava:31.1-jre'
Expand All @@ -90,7 +90,7 @@ dependencies {
cliImplementation 'joda-time:joda-time:2.9.4'
cliImplementation 'io.reactivex.rxjava2:rxjava:2.1.1'
cliImplementation 'com.squareup.retrofit2:retrofit:2.3.0'
cliImplementation 'com.squareup.okhttp3:okhttp:4.4.1'
cliImplementation 'com.squareup.okhttp3:okhttp:4.11.0'
cliImplementation 'com.google.guava:guava:31.1-jre'
cliImplementation 'com.datadoghq:dd-trace-api:1.10.0'

Expand All @@ -103,7 +103,7 @@ dependencies {
testImplementation 'org.xerial:sqlite-jdbc:3.40.0.0'
testImplementation 'joda-time:joda-time:2.9.4'
testImplementation 'com.squareup.retrofit2:retrofit:2.3.0'
testImplementation 'com.squareup.okhttp3:okhttp:4.4.1'
testImplementation 'com.squareup.okhttp3:okhttp:4.11.0'
testImplementation 'com.google.guava:guava:31.1-jre'

ccapiImplementation sourceSets.main.output
Expand All @@ -114,7 +114,7 @@ dependencies {
ccapiImplementation 'com.carrotsearch:hppc:0.9.1'
ccapiImplementation 'io.reactivex.rxjava2:rxjava:2.1.1'
ccapiImplementation "com.squareup.retrofit2:retrofit:2.3.0"
ccapiImplementation 'com.squareup.okhttp3:okhttp:4.4.1'
ccapiImplementation 'com.squareup.okhttp3:okhttp:4.11.0'
ccapiImplementation 'com.google.guava:guava:31.1-jre'
ccapiImplementation 'io.opentracing:opentracing-api:0.33.0'
ccapiImplementation 'io.opentracing:opentracing-util:0.33.0'
Expand All @@ -128,7 +128,7 @@ dependencies {
translateImplementation 'org.json:json:20140107'
translateImplementation 'io.reactivex.rxjava2:rxjava:2.1.1'
translateImplementation "com.squareup.retrofit2:retrofit:2.3.0"
translateImplementation 'com.squareup.okhttp3:okhttp:4.4.1'
translateImplementation 'com.squareup.okhttp3:okhttp:4.11.0'
translateImplementation 'com.google.guava:guava:31.1-jre'

// 'compile' dependency is also needed to run 'gradle jmh' for some reason,
Expand Down
8 changes: 5 additions & 3 deletions src/main/java/org/commcare/util/LogTypes.java
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,11 @@ public class LogTypes {

public static final String TYPE_CC_UPDATE = "commcare-update";

/**
* Logs related to Firebase Cloud Messaging
*/
public static final String TYPE_NETWORK = "commcare-network";

/**
* Logs related to Firebase Cloud Messaging
*/
public static final String TYPE_FCM = "fcm";

}

0 comments on commit 68ce506

Please sign in to comment.