diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2019-10-28 16:58:00 +0100 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2019-10-28 17:50:14 +0100 |
| commit | 11c55651c5da08e19c113ea1df6b9d5de64121ce (patch) | |
| tree | 3d1168f410ecd26cb5cf1dd64952665ee7bb71e9 | |
| parent | f860e38141f4b5aa3b1c9642c52c5d98a99d5391 (diff) | |
Update build scripts
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | build.gradle.kts | 2 | ||||
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 4 | ||||
| -rw-r--r-- | main/build.gradle.kts | 9 | ||||
| m--------- | main/src/main/cpp/openvpn3 | 0 |
5 files changed, 9 insertions, 7 deletions
@@ -22,3 +22,4 @@ main/openvpn3 main/src/ovpn3/java/net/openvpn/ovpn3 main/.externalNativeBuild +main/.cxx diff --git a/build.gradle.kts b/build.gradle.kts index edb097e9..b7f901d8 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -10,7 +10,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:3.4.2") + classpath("com.android.tools.build:gradle:3.5.1") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.50") } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0490030c..4dc617b8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Jan 15 13:45:29 CET 2019 +#Mon Oct 28 16:47:57 CET 2019 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-5.4.1-all.zip diff --git a/main/build.gradle.kts b/main/build.gradle.kts index 8f983de6..7337dc0d 100644 --- a/main/build.gradle.kts +++ b/main/build.gradle.kts @@ -46,8 +46,8 @@ android { defaultConfig { minSdkVersion(14) targetSdkVersion(29) //'Q'.toInt() - versionCode = 161 - versionName = "0.7.8" + versionCode = 163 + versionName = "0.7.10" externalNativeBuild { cmake { @@ -167,7 +167,8 @@ dependencies { testImplementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.50") testImplementation("junit:junit:4.12") - testImplementation("org.mockito:mockito-core:3.0.0") - testImplementation("org.robolectric:robolectric:4.3") + testImplementation("org.mockito:mockito-core:3.1.0") + testImplementation("org.robolectric:robolectric:4.3.1") + implementation("androidx.core:core:1.1.0") } diff --git a/main/src/main/cpp/openvpn3 b/main/src/main/cpp/openvpn3 -Subproject 9d5115b47532d1799d2de6e7872d886fc2e8be8 +Subproject 636e3d238f12d0aae6ac567ea112f4726335c8c |