Update Gradle & IDE setup

As part of moving to new laptop. Permissions also changed en route, but I think the new values are more appropriate, so that's fine.
httptoolkit · Dec 4, 2020 · a167212 · a167212
1 parent d09ff2e
commit a167212
Show file tree

Hide file tree

Showing 27 changed files with 38 additions and 5 deletions.
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -51,7 +51,7 @@ dependencies {
     implementation 'com.beust:klaxon:5.0.1'
     implementation 'com.squareup.okhttp3:okhttp:4.3.0'
     implementation 'com.google.android.material:material:1.1.0-beta02'
-    implementation 'net.swiftzer.semver:semver:1.1.0'
+    implementation 'net.swiftzer.semver:semver:1.1.1'
     implementation 'io.sentry:sentry-android:1.7.27'
     implementation 'org.slf4j:slf4j-nop:1.7.25'
     implementation 'com.google.android.gms:play-services-analytics:10.2.4'

diff --git a/app/src/main/java/tech/httptoolkit/android/vpn/ClientPacketWriter.java b/app/src/main/java/tech/httptoolkit/android/vpn/ClientPacketWriter.java
diff --git a/app/src/main/java/tech/httptoolkit/android/vpn/Packet.java b/app/src/main/java/tech/httptoolkit/android/vpn/Packet.java
diff --git a/app/src/main/java/tech/httptoolkit/android/vpn/Session.java b/app/src/main/java/tech/httptoolkit/android/vpn/Session.java
diff --git a/app/src/main/java/tech/httptoolkit/android/vpn/SessionHandler.java b/app/src/main/java/tech/httptoolkit/android/vpn/SessionHandler.java
diff --git a/app/src/main/java/tech/httptoolkit/android/vpn/SessionManager.java b/app/src/main/java/tech/httptoolkit/android/vpn/SessionManager.java
diff --git a/app/src/main/java/tech/httptoolkit/android/vpn/socket/DataConst.java b/app/src/main/java/tech/httptoolkit/android/vpn/socket/DataConst.java
diff --git a/app/src/main/java/tech/httptoolkit/android/vpn/socket/ICloseSession.java b/app/src/main/java/tech/httptoolkit/android/vpn/socket/ICloseSession.java
diff --git a/app/src/main/java/tech/httptoolkit/android/vpn/socket/IProtectSocket.java b/app/src/main/java/tech/httptoolkit/android/vpn/socket/IProtectSocket.java
diff --git a/app/src/main/java/tech/httptoolkit/android/vpn/socket/SocketChannelReader.java b/app/src/main/java/tech/httptoolkit/android/vpn/socket/SocketChannelReader.java
diff --git a/app/src/main/java/tech/httptoolkit/android/vpn/socket/SocketChannelWriter.java b/app/src/main/java/tech/httptoolkit/android/vpn/socket/SocketChannelWriter.java
diff --git a/app/src/main/java/tech/httptoolkit/android/vpn/socket/SocketNIODataService.java b/app/src/main/java/tech/httptoolkit/android/vpn/socket/SocketNIODataService.java
diff --git a/app/src/main/java/tech/httptoolkit/android/vpn/socket/SocketProtector.java b/app/src/main/java/tech/httptoolkit/android/vpn/socket/SocketProtector.java
diff --git a/app/src/main/java/tech/httptoolkit/android/vpn/transport/PacketHeaderException.java b/app/src/main/java/tech/httptoolkit/android/vpn/transport/PacketHeaderException.java
diff --git a/app/src/main/java/tech/httptoolkit/android/vpn/transport/ip/IPPacketFactory.java b/app/src/main/java/tech/httptoolkit/android/vpn/transport/ip/IPPacketFactory.java
diff --git a/app/src/main/java/tech/httptoolkit/android/vpn/transport/ip/IPv4Header.java b/app/src/main/java/tech/httptoolkit/android/vpn/transport/ip/IPv4Header.java
diff --git a/app/src/main/java/tech/httptoolkit/android/vpn/transport/tcp/TCPHeader.java b/app/src/main/java/tech/httptoolkit/android/vpn/transport/tcp/TCPHeader.java
diff --git a/app/src/main/java/tech/httptoolkit/android/vpn/transport/tcp/TCPPacketFactory.java b/app/src/main/java/tech/httptoolkit/android/vpn/transport/tcp/TCPPacketFactory.java
diff --git a/app/src/main/java/tech/httptoolkit/android/vpn/transport/udp/UDPHeader.java b/app/src/main/java/tech/httptoolkit/android/vpn/transport/udp/UDPHeader.java
diff --git a/app/src/main/java/tech/httptoolkit/android/vpn/transport/udp/UDPPacketFactory.java b/app/src/main/java/tech/httptoolkit/android/vpn/transport/udp/UDPPacketFactory.java
diff --git a/app/src/main/java/tech/httptoolkit/android/vpn/util/PacketUtil.java b/app/src/main/java/tech/httptoolkit/android/vpn/util/PacketUtil.java
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.3'
+        classpath 'com.android.tools.build:gradle:4.1.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.google.gms:google-services:3.0.0'
         // NOTE: Do not place your application dependencies here; they belong

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri May 01 14:19:47 CEST 2020
+#Fri Dec 04 13:54:32 CET 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip