From 48cf66f75e91d7bd017277bc249e6cbec0a4a078 Mon Sep 17 00:00:00 2001 From: cyBerta Date: Mon, 30 Oct 2023 18:38:28 +0100 Subject: Replace Butterknife references with ViewBinding --- app/build.gradle | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'app/build.gradle') diff --git a/app/build.gradle b/app/build.gradle index 0b5165b0..aa9e0480 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -415,16 +415,10 @@ dependencies { androidTestImplementation 'tools.fastlane:screengrab:2.1.1' testImplementation 'tools.fastlane:screengrab:2.1.1' - testImplementation 'org.json:json:20180813' androidTestImplementation 'androidx.test.ext:junit:1.1.4' debugImplementation 'com.squareup.leakcanary:leakcanary-android-core:2.9.1' - annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.3' - annotationProcessor 'com.squareup.dagger:dagger-compiler:1.2.2' - implementation 'com.jakewharton:butterknife:10.2.1' - //TODO: replace that library - compileOnly 'com.squareup.dagger:dagger-compiler:1.2.2' - implementation 'com.github.pedrovgs:renderers:1.5' + implementation 'com.google.code.gson:gson:2.8.6' implementation 'com.squareup.okhttp3:okhttp:4.10.0' implementation 'com.squareup.okhttp3:okhttp-dnsoverhttps:4.10.0' -- cgit v1.2.3 From 820d3c6998848a0324f75c68bdbf05d321235b29 Mon Sep 17 00:00:00 2001 From: cyBerta Date: Mon, 30 Oct 2023 18:45:10 +0100 Subject: update to Gradle 8 --- app/build.gradle | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'app/build.gradle') diff --git a/app/build.gradle b/app/build.gradle index aa9e0480..efe7c1a3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,9 +4,8 @@ import java.util.regex.Pattern apply plugin: 'com.android.application' android { - compileSdkVersion 33 ndkVersion "21.4.7075529" - buildToolsVersion '33.0.2' + namespace = "se.leap.bitmaskclient" compileOptions { targetCompatibility 1.8 @@ -17,6 +16,17 @@ android { enabled = true } + packaging { + jniLibs { + useLegacyPackaging = true + } + } + + buildFeatures { + buildConfig true + aidl true + } + defaultConfig { applicationId "se.leap.bitmaskclient" // the factor 1000 is used so that gplay users can upgrade from split apks ((current version number - 1) * 1000) + n @@ -24,6 +34,7 @@ android { // however we don't calculate the versionCode here, because F-Droid doesn't like that versionCode 169000 versionName "1.1.8" + compileSdk 33 minSdkVersion 21 targetSdkVersion 33 vectorDrawables.useSupportLibrary = true @@ -498,7 +509,7 @@ subprojects { afterEvaluate {project -> if (project.hasProperty("android")) { android { - compileSdkVersion 31 + compileSdkVersion 33 } } } -- cgit v1.2.3 From 2b8dbd9b09ce85ecb04d02998a8f81cb96b2f907 Mon Sep 17 00:00:00 2001 From: cyBerta Date: Mon, 30 Oct 2023 18:45:49 +0100 Subject: update to Java 17 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/build.gradle') diff --git a/app/build.gradle b/app/build.gradle index efe7c1a3..6439298a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,8 +8,8 @@ android { namespace = "se.leap.bitmaskclient" compileOptions { - targetCompatibility 1.8 - sourceCompatibility 1.8 + targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_17 } viewBinding { -- cgit v1.2.3 From 57a9eec96ad4ebe92539cbd384ed459d617ddf7f Mon Sep 17 00:00:00 2001 From: cyBerta Date: Mon, 30 Oct 2023 18:54:47 +0100 Subject: update build_deps.sh and build.gradle after ics-openvpn's task name to build native libs changed --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/build.gradle') diff --git a/app/build.gradle b/app/build.gradle index 6439298a..305292db 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -308,7 +308,7 @@ android { 'ovpnlibs/assets', '../ics-openvpn/main/build/ovpnassets', ] - jniLibs.srcDirs = ['../ics-openvpn/main/build/intermediates/cmake/skeletonRelease/obj/'] + jniLibs.srcDirs = ['../ics-openvpn/main/build/intermediates/cmake/skeletonOvpn2Release/obj/'] jni.srcDirs = [] //disable automatic ndk-build } -- cgit v1.2.3 From 3197444d9da4cf3a22d4c5aaf41da81f36d76bdf Mon Sep 17 00:00:00 2001 From: cyBerta Date: Tue, 31 Oct 2023 11:45:22 +0100 Subject: remove insecure flavor, it depended on deprecated setup UI --- app/build.gradle | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'app/build.gradle') diff --git a/app/build.gradle b/app/build.gradle index 305292db..4c9f6a25 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -117,9 +117,6 @@ android { production { dimension "implementation" } - insecure { - dimension "implementation" - } normal { dimension "branding" @@ -355,7 +352,6 @@ android { * normalProductionFatDebug -> Bitmask development build, includes all ABIS * customProductionFatwebDebug -> branded development build, includes all ABIs, for distribution through a download page * normalProductionFatWebDebug -> Bitmask development build, includes all ABIS, for distribution through a download page - * normalInsecureFatDebug -> Bitmask development build, doesn't checks certificates (for test server setup w/o valid certificates), includes all ABIs * * Branded Releases: * ----------------- @@ -389,11 +385,7 @@ android { def supportsSplitApk = variant.flavors[0].splitApk def branding = variant.flavors[0].name // To check for a certain build type, use variant.buildType.name == "" - if (((names.contains("insecure") && !names.contains("fat")) || - (names.contains("insecure") && buildTypeName.contains("beta")) || - (names.contains("insecure") && buildTypeName.contains("release")) || - (names.contains("insecure") && branding.contains("custom")) || - (buildTypeName.contains("debug") && !(names.contains("fatweb") || names.contains("fat"))) || + if (((buildTypeName.contains("debug") && !(names.contains("fatweb") || names.contains("fat"))) || (names.contains("fatweb") && buildTypeName.contains("beta")) || (!supportsSplitApk && !names.contains("fat"))) ) { -- cgit v1.2.3