From fd1c6fde605c87f2f290d2f2d948f5b58f820453 Mon Sep 17 00:00:00 2001 From: Vadym Date: Tue, 9 Jun 2020 10:22:27 +0300 Subject: [PATCH 01/24] 1. gradle upgrade --- app/build.gradle | 8 +++----- build.gradle | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 5326171..b6a2ca0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,15 +1,13 @@ apply plugin: 'com.android.application' - apply plugin: 'kotlin-android' - apply plugin: 'kotlin-android-extensions' android { - compileSdkVersion 28 + compileSdkVersion 29 defaultConfig { applicationId "io.github.chronosx88.yggdrasil" minSdkVersion 21 - targetSdkVersion 28 + targetSdkVersion 29 versionCode 1 versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -34,5 +32,5 @@ dependencies { implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.0-RC2' implementation 'com.google.android.material:material:1.1.0-alpha09' implementation 'org.hjson:hjson:3.0.0' - implementation 'com.google.code.gson:gson:2.8.5' + implementation 'com.google.code.gson:gson:2.8.6' } diff --git a/build.gradle b/build.gradle index 438d280..03ed29e 100644 --- a/build.gradle +++ b/build.gradle @@ -1,14 +1,14 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.3.41' + ext.kotlin_version = '1.3.72' repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.4.2' + classpath 'com.android.tools.build:gradle:4.0.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files From da0cc8f3bcedcb24d21072789f490f29f022c7dd Mon Sep 17 00:00:00 2001 From: Vadym Date: Tue, 9 Jun 2020 14:04:33 +0300 Subject: [PATCH 02/24] 1. auto apk signing --- .idea/compiler.xml | 6 ++++++ .idea/jarRepositories.xml | 25 +++++++++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 .idea/compiler.xml create mode 100644 .idea/jarRepositories.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..61a9130 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..a5f05cd --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + \ No newline at end of file From 21e2b4faeea1291a001f8929e0b2427b81f452aa Mon Sep 17 00:00:00 2001 From: Vadym Date: Tue, 9 Jun 2020 14:05:12 +0300 Subject: [PATCH 03/24] 1. apk auto sining --- .idea/gradle.xml | 4 +++- .idea/misc.xml | 2 +- app/build.gradle | 8 ++++++++ gradle/wrapper/gradle-wrapper.properties | 4 ++-- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 648f57f..8322392 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -1,8 +1,11 @@ + diff --git a/.idea/misc.xml b/.idea/misc.xml index 37a7509..39c65f6 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + diff --git a/app/build.gradle b/app/build.gradle index b6a2ca0..9fe7fbd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -18,6 +18,14 @@ android { proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } + signingConfigs { + ciRelease { + storeFile file(KEYSTORE) + storePassword System.getenv("KEYSTORE_PASSWORD") + keyAlias System.getenv("KEY_ALIAS") + keyPassword System.getenv("KEY_PASSWORD") + } + } } dependencies { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index adb9915..95a0d88 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Aug 20 15:25:37 MSK 2019 +#Fri May 29 21:25:24 EEST 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-milestone-1-bin.zip From 355122959fd694c12d225dc36f98e9fd329a6cac Mon Sep 17 00:00:00 2001 From: Vadym Date: Tue, 9 Jun 2020 14:05:36 +0300 Subject: [PATCH 04/24] 1. auto siging --- app/build.gradle | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/build.gradle b/app/build.gradle index 9fe7fbd..87df930 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,6 +17,9 @@ android { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } + ciRelease { + signingConfig signingConfigs.ciRelease + } } signingConfigs { ciRelease { From f3263ae957c896e5e0911d2497e1947479c4bf6a Mon Sep 17 00:00:00 2001 From: Vadym Date: Tue, 9 Jun 2020 14:06:29 +0300 Subject: [PATCH 05/24] 1. auto signing --- gradle.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/gradle.properties b/gradle.properties index 3d8ce0c..eb9b2e4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,3 +15,4 @@ org.gradle.jvmargs=-Xmx1536m kotlin.code.style=official android.useAndroidX=true android.enableJetifier=true +KEYSTORE=release.keystore From 7fdafc6675ae51b22264ddec1746bc4aeb73c1a2 Mon Sep 17 00:00:00 2001 From: Vadym Date: Tue, 9 Jun 2020 14:19:30 +0300 Subject: [PATCH 06/24] 1. gradle parameter name fix --- app/build.gradle | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 87df930..e55d6ea 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,13 +16,11 @@ android { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + signingConfig signingConfigs.release } - ciRelease { - signingConfig signingConfigs.ciRelease - } } signingConfigs { - ciRelease { + release { storeFile file(KEYSTORE) storePassword System.getenv("KEYSTORE_PASSWORD") keyAlias System.getenv("KEY_ALIAS") From 4739b8f2f8931fc2ca55680afb3c6c95ce2685c3 Mon Sep 17 00:00:00 2001 From: Vadym Date: Tue, 9 Jun 2020 14:21:53 +0300 Subject: [PATCH 07/24] definition fix --- app/build.gradle | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index e55d6ea..371753a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,13 +11,6 @@ android { versionCode 1 versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - } - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - signingConfig signingConfigs.release - } } signingConfigs { release { @@ -27,6 +20,13 @@ android { keyPassword System.getenv("KEY_PASSWORD") } } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + signingConfig signingConfigs.release + } + } } dependencies { From ee19899680109496fc87baf00185cbcd120b5e17 Mon Sep 17 00:00:00 2001 From: Vadym Date: Tue, 9 Jun 2020 14:24:20 +0300 Subject: [PATCH 08/24] aar fix --- yggdrasil/build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/yggdrasil/build.gradle b/yggdrasil/build.gradle index 2785576..8ab6bc7 100644 --- a/yggdrasil/build.gradle +++ b/yggdrasil/build.gradle @@ -1,2 +1 @@ configurations.maybeCreate("default") -artifacts.add("default", file('yggdrasil.aar')) \ No newline at end of file From d5a9bd82c97d2d59bbec755af7bd12d5c48ac976 Mon Sep 17 00:00:00 2001 From: Vadym Date: Tue, 9 Jun 2020 17:14:11 +0300 Subject: [PATCH 09/24] Revert "aar fix" This reverts commit ee19899680109496fc87baf00185cbcd120b5e17. --- yggdrasil/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/yggdrasil/build.gradle b/yggdrasil/build.gradle index 8ab6bc7..2785576 100644 --- a/yggdrasil/build.gradle +++ b/yggdrasil/build.gradle @@ -1 +1,2 @@ configurations.maybeCreate("default") +artifacts.add("default", file('yggdrasil.aar')) \ No newline at end of file From 1067752dcb6e7176cb128cb56ffbab738c835c7c Mon Sep 17 00:00:00 2001 From: vadym Date: Tue, 9 Jun 2020 08:13:09 -0700 Subject: [PATCH 10/24] 1. deleted parameters. see details in: https://github.com/yggdrasil-network/yggdrasil-extras/issues/4 2. added ndk explicit version --- app/build.gradle | 1 + app/src/main/java/io/github/chronosx88/yggdrasil/Utils.kt | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index b6a2ca0..5e36c7c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -18,6 +18,7 @@ android { proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } + ndkVersion "21.2.6472646" } dependencies { diff --git a/app/src/main/java/io/github/chronosx88/yggdrasil/Utils.kt b/app/src/main/java/io/github/chronosx88/yggdrasil/Utils.kt index 0982a45..8757e6a 100644 --- a/app/src/main/java/io/github/chronosx88/yggdrasil/Utils.kt +++ b/app/src/main/java/io/github/chronosx88/yggdrasil/Utils.kt @@ -18,9 +18,9 @@ fun createNativeYggConfig(config: Config): NodeConfig { nativeConfig.adminListen = config.adminListen nativeConfig.encryptionPrivateKey = config.encryptionPrivateKey nativeConfig.encryptionPublicKey = config.encryptionPublicKey - nativeConfig.ifMTU = config.ifMTU - nativeConfig.ifName = config.ifName - nativeConfig.ifTAPMode = config.ifTAPMode + //nativeConfig.ifMTU = config.ifMTU + //nativeConfig.ifName = config.ifName + //nativeConfig.ifTAPMode = config.ifTAPMode nativeConfig.nodeInfoPrivacy = config.nodeInfoPrivacy nativeConfig.signingPrivateKey = config.signingPrivateKey nativeConfig.signingPublicKey = config.signingPublicKey From 7cd7596e3beb06eaf7161b65c0c86242510b3565 Mon Sep 17 00:00:00 2001 From: vadym Date: Tue, 9 Jun 2020 08:38:39 -0700 Subject: [PATCH 11/24] 1. deleted parameters. see details in: https://github.com/yggdrasil-network/yggdrasil-extras/issues/4 2. added ndk explicit version --- app/build.gradle | 3 ++- gradle.properties | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index cc843f1..3e72e09 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,7 +14,8 @@ android { } signingConfigs { release { - storeFile file(KEYSTORE) + + storeFile file(KEYSTORE_FILE_PATH) storePassword System.getenv("KEYSTORE_PASSWORD") keyAlias System.getenv("KEY_ALIAS") keyPassword System.getenv("KEY_PASSWORD") diff --git a/gradle.properties b/gradle.properties index eb9b2e4..fa71096 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,4 +15,4 @@ org.gradle.jvmargs=-Xmx1536m kotlin.code.style=official android.useAndroidX=true android.enableJetifier=true -KEYSTORE=release.keystore +KEYSTORE_FILE_PATH=/home/vadym/keystore/yggdrasil.jks From 6c1b82a46b5d37afca7bb0a0d492f59b6652c668 Mon Sep 17 00:00:00 2001 From: vadym Date: Tue, 9 Jun 2020 08:45:37 -0700 Subject: [PATCH 12/24] 1. put back ifName parameter --- .idea/gradle.xml | 2 +- .../io/github/chronosx88/yggdrasil/Utils.kt | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- settings.gradle | 1 + yggdrasil.aar/build.gradle | 2 ++ yggdrasil.aar/yggdrasil.aar | Bin 0 -> 9768786 bytes 6 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 yggdrasil.aar/build.gradle create mode 100644 yggdrasil.aar/yggdrasil.aar diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 8322392..c7adabe 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -5,7 +5,6 @@