Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependency versions #243

Merged
merged 1 commit into from
Jan 15, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
language: android
env:
global:
- ANDROID_API=28
- ANDROID_BUILD_TOOLS=28.0.3
- ANDROID_API=29
- ANDROID_BUILD_TOOLS=29.0.2
before_install:
cd Android;
android:
Expand Down
34 changes: 19 additions & 15 deletions Android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ android {
storePassword keystoreProperties['storePassword']
}
}
compileSdkVersion 28
buildToolsVersion '28.0.3'
compileSdkVersion 29
buildToolsVersion '29.0.2'

defaultConfig {
applicationId "app.intra"
// The Java code is compatible back to SDK version 14, but gomobile requires
// a minSdkVersion of 15.
minSdkVersion 15
targetSdkVersion 28
targetSdkVersion 29
versionCode 47
versionName "1.2.4"
vectorDrawables.useSupportLibrary = true
Expand Down Expand Up @@ -87,31 +87,35 @@ repositories {
dependencies {
// Third-party dependency: OkHttp3
implementation fileTree(include: [
'okhttp-3.12.3.jar', // 3.12.* has branched to support API <21. 3.13+ doesn't.
'okio-1.15.0.jar',
'guava-27.1-android.jar'
// 3.12.* has branched to support API <21. 3.13+ doesn't.
'okhttp-3.12.8.jar',
'okio-1.17.5.jar',
'guava-28.2-android.jar',
'failureaccess-1.0.1.jar' // Dependency of Guava
], dir: 'libs')

// Third-party test dependencies.
testImplementation 'junit:junit:4.12'
testImplementation 'org.json:json:20171018'
testImplementation 'org.mockito:mockito-core:2.13.0'
// Required for instrumented tests
androidTestImplementation 'androidx.annotation:annotation:1.0.0'
androidTestImplementation 'androidx.annotation:annotation:1.1.0'
androidTestImplementation 'androidx.test:runner:1.2.0'
// UI libraries.
implementation 'androidx.appcompat:appcompat:1.0.2'
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'com.google.android.material:material:1.0.0'
implementation 'androidx.preference:preference:1.0.0'
implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
implementation 'androidx.recyclerview:recyclerview:1.0.0'
implementation 'androidx.preference:preference:1.1.0'
implementation 'androidx.recyclerview:recyclerview:1.1.0'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
// For Firebase Analytics, etc.
implementation 'com.google.firebase:firebase-core:16.0.9' // Last version to support API <16
implementation 'com.google.firebase:firebase-perf:16.2.5' // Last version to support API <17
//noinspection GradleDependency : Last version to support API <16
implementation 'com.google.firebase:firebase-core:16.0.9' //
//noinspection GradleDependency : Last version to support API <17
implementation 'com.google.firebase:firebase-perf:16.2.5'
implementation 'com.crashlytics.sdk.android:crashlytics:2.10.1'
implementation 'com.crashlytics.sdk.android:crashlytics-ndk:2.1.0'
implementation 'com.google.firebase:firebase-config:16.5.0' // Last version to support API <16
implementation 'com.crashlytics.sdk.android:crashlytics-ndk:2.1.1'
//noinspection GradleDependency : Last version to support API <16
implementation 'com.google.firebase:firebase-config:16.5.0'
// For go-tun2socks
implementation project(":tun2socks")
}
Expand Down
Binary file added Android/app/libs/failureaccess-1.0.1.jar
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed Android/app/libs/okio-1.15.0.jar
Binary file not shown.
Binary file added Android/app/libs/okio-1.17.5.jar
Binary file not shown.
6 changes: 2 additions & 4 deletions Android/app/proguard-rules.pro
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,5 @@
# The minor size savings isn't worth making debugging harder.
-dontobfuscate

# Our tun2socks library calls back into this class when printing log
# messages. Proguard can't see that external reference to the log
# method, so we need to mark it for preservation explicitly.
-keep public class org.outline.tun2socks.Tun2SocksJni { *; }
# See https://github.com/google/guava/wiki/UsingProGuardWithGuava
-dontwarn java.lang.ClassValue
3 changes: 2 additions & 1 deletion Android/app/src/main/res/layout/transaction_row.xml
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,9 @@
android:layout_gravity="end|center_vertical"
android:layout_margin="10dp"
android:layout_weight="0"
android:scrollbars="none"
android:textOff=""
android:textOn=""/>
android:textOn="" />
</LinearLayout>

<androidx.constraintlayout.widget.ConstraintLayout
Expand Down
6 changes: 3 additions & 3 deletions Android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ buildscript {
}
}
dependencies {
classpath 'com.android.tools.build:gradle:3.4.2'
classpath 'com.android.tools.build:gradle:3.5.3'

// For Firebase Analytics
classpath 'com.google.gms:google-services:4.3.0'
classpath 'com.google.firebase:perf-plugin:1.3.0'
classpath 'com.google.gms:google-services:4.3.3'
classpath 'com.google.firebase:perf-plugin:1.3.1'
classpath 'io.fabric.tools:gradle:1.28.1'
}
}
Expand Down
Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2015 Google Inc. All Rights Reserved.
Copyright 2015 The Error Prone Authors.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -21,7 +21,7 @@
<parent>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_parent</artifactId>
<version>2.1.3</version>
<version>2.3.1</version>
</parent>

<name>error-prone annotations</name>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2011 Google Inc. All Rights Reserved.
Copyright 2011 The Error Prone Authors.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -27,16 +27,17 @@
<name>Maven parent POM</name>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_parent</artifactId>
<version>2.1.3</version>
<version>2.3.1</version>
<packaging>pom</packaging>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<guava.version>22.0</guava.version>
<guava.version>23.5-jre</guava.version>
<truth.version>0.36</truth.version>
<javac.version>9-dev-r4023-3</javac.version>
<autovalue.version>1.3</autovalue.version>
<javac.version>9+181-r4173-1</javac.version>
<autovalue.version>1.5.3</autovalue.version>
<junit.version>4.13-SNAPSHOT</junit.version>
<dataflow.version>2.5.0</dataflow.version>
</properties>

<modules>
Expand All @@ -45,6 +46,7 @@
<module>core</module>
<module>annotation</module>
<module>annotations</module>
<module>type_annotations</module>
<module>docgen</module>
<module>docgen_processor</module>
<module>ant</module>
Expand Down Expand Up @@ -102,17 +104,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version>
<version>3.0.0</version>
<configuration>
<notimestamp>true</notimestamp>
</configuration>
<dependencies>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-io</artifactId>
<version>2.0.9</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down
Loading