From cdb6ca139b30645ef2d0d2b58e735911e1ecb442 Mon Sep 17 00:00:00 2001
From: Gegham <geghammail.work@gmail.com>
Date: Tue, 19 May 2020 16:56:25 +0400
Subject: [PATCH 1/2] Replaced Tunnel library with JCenter dependency

---
 build.gradle    | 2 +-
 settings.gradle | 1 -
 ui/build.gradle | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 7c27a19..0ef8add 100644
--- a/build.gradle
+++ b/build.gradle
@@ -33,7 +33,7 @@ buildscript {
         groupName = 'com.wireguard.android'
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:$agpVersion"
+        classpath "com.android.tools.build:gradle:${agpVersion}"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
         classpath "com.github.dcendents:android-maven-gradle-plugin:$mavenPluginVersion"
         classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:$bintrayPluginVersion"
diff --git a/settings.gradle b/settings.gradle
index 56e38aa..4f16d51 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,2 +1 @@
-include ':tunnel'
 include ':ui'
diff --git a/ui/build.gradle b/ui/build.gradle
index 002981d..60cdeec 100644
--- a/ui/build.gradle
+++ b/ui/build.gradle
@@ -65,7 +65,6 @@ android {
 }
 
 dependencies {
-    implementation project(":tunnel")
     implementation "androidx.annotation:annotation:$annotationsVersion"
     implementation "androidx.appcompat:appcompat:$appcompatVersion"
     implementation "androidx.constraintlayout:constraintlayout:$constraintLayoutVersion"
@@ -81,6 +80,7 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion"
     implementation "net.sourceforge.streamsupport:android-retrofuture:$streamsupportVersion"
+    implementation 'com.wireguard.android:tunnel:1.0.20200407'
 }
 
 tasks.withType(JavaCompile) {

From 78e3ce1ec82d87084c67199c6095ee464ef82778 Mon Sep 17 00:00:00 2001
From: Mushegh98 <musheghsahakyan98@gmail.com>
Date: Tue, 19 May 2020 18:00:27 +0400
Subject: [PATCH 2/2] Placed the dependency at the first position in the list
 and stored the version number in an argument.

---
 build.gradle    | 1 +
 ui/build.gradle | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 0ef8add..1c2eac1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,6 +29,7 @@ buildscript {
         streamsupportVersion = '1.7.2'
         threetenabpVersion = '1.2.4'
         zxingEmbeddedVersion = '3.6.0'
+        tunnelVersion = '1.0.20200407'
 
         groupName = 'com.wireguard.android'
     }
diff --git a/ui/build.gradle b/ui/build.gradle
index 60cdeec..99845b4 100644
--- a/ui/build.gradle
+++ b/ui/build.gradle
@@ -65,6 +65,7 @@ android {
 }
 
 dependencies {
+    implementation "com.wireguard.android:tunnel:$tunnelVersion"
     implementation "androidx.annotation:annotation:$annotationsVersion"
     implementation "androidx.appcompat:appcompat:$appcompatVersion"
     implementation "androidx.constraintlayout:constraintlayout:$constraintLayoutVersion"
@@ -80,7 +81,6 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion"
     implementation "net.sourceforge.streamsupport:android-retrofuture:$streamsupportVersion"
-    implementation 'com.wireguard.android:tunnel:1.0.20200407'
 }
 
 tasks.withType(JavaCompile) {