Bump version numbers for 1.2.18 release.

Merge branch 'update-bridges' into 'master'
Update list of Tor bridges See merge request briar/briar!1403
2026-02-12 10:49:06 +01:00 · 2021-03-11 15:25:32 +00:00 · 2021-03-11 15:20:11 +00:00 · 2021-03-11 15:14:20 +00:00 · 2021-03-11 14:24:46 +00:00 · 2021-03-11 12:20:41 +00:00
3 changed files with 13 additions and 6 deletions
--- a/bramble-android/build.gradle
+++ b/bramble-android/build.gradle
@@ -8,11 +8,15 @@ android {
 	compileSdkVersion 30
 	buildToolsVersion '30.0.2'

+	packagingOptions {
+		doNotStrip '**/*.so'
+	}
+
 	defaultConfig {
 		minSdkVersion 16
 		targetSdkVersion 29
-		versionCode 10217
-		versionName "1.2.17"
+		versionCode 10218
+		versionName "1.2.18"
 		consumerProguardFiles 'proguard-rules.txt'

 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
--- a/bramble-core/src/main/resources/bridges
+++ b/bramble-core/src/main/resources/bridges
@@ -2,12 +2,11 @@ Bridge obfs4 192.95.36.142:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUV
 Bridge obfs4 38.229.1.78:80 C8CBDB2464FC9804A69531437BCF2BE31FDD2EE4 cert=Hmyfd2ev46gGY7NoVxA9ngrPF2zCZtzskRTzoWXbxNkzeVnGFPWmrTtILRyqCTjHR+s9dg iat-mode=1
 Bridge obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0
 Bridge obfs4 85.31.186.98:443 011F2599C0E9B27EE74B353155E244813763C3E5 cert=ayq0XzCwhpdysn5o0EyDUbmSOx3X/oTEbzDMvczHOdBJKlvIdHHLJGkZARtT4dcBFArPPg iat-mode=0
-Bridge obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0
+Bridge obfs4 144.217.20.138:80 FB70B257C162BF1038CA669D568D76F5B7F0BABB cert=vYIV5MgrghGQvZPIi1tJwnzorMgqgmlKaB77Y3Z9Q/v94wZBOAXkW+fdx4aSxLVnKO+xNw iat-mode=0
 Bridge obfs4 193.11.166.194:27015 2D82C2E354D531A68469ADF7F878FA6060C6BACA cert=4TLQPJrTSaDffMK7Nbao6LC7G9OW/NHkUwIdjLSS3KYf0Nv4/nQiiI8dY2TcsQx01NniOg iat-mode=0
 Bridge obfs4 193.11.166.194:27020 86AC7B8D430DAC4117E9F42C9EAED18133863AAF cert=0LDeJH4JzMDtkJJrFphJCiPqKx7loozKN7VNfuukMGfHO0Z8OGdzHVkhVAOfo1mUdv9cMg iat-mode=0
 Bridge obfs4 193.11.166.194:27025 1AE2C08904527FEA90C4C4F8C1083EA59FBC6FAF cert=ItvYZzW5tn6v3G4UnQa6Qz04Npro6e81AP70YujmK/KXwDFPTs3aHXcHp4n8Vt6w/bv8cA iat-mode=0
 Bridge obfs4 209.148.46.65:443 74FAD13168806246602538555B5521A0383A1875 cert=ssH+9rP8dG2NLDN2XuFw63hIO/9MNNinLmxQDpVa+7kTOa9/m+tGWT1SmSYpQ9uTBGa6Hw iat-mode=0
-Bridge obfs4 146.57.248.225:22 10A6CD36A537FCE513A322361547444B393989F0 cert=K1gDtDAIcUfeLqbstggjIw2rtgIKqdIhUlHp82XRqNSq/mtAjp1BIC9vHKJ2FAEpGssTPw iat-mode=0
 Bridge obfs4 45.145.95.6:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0
 Bridge obfs4 51.222.13.177:80 5EDAC3B810E12B01F6FD8050D2FD3E277B289A08 cert=2uplIpLQ0q9+0qMFrK5pkaYRDOe460LL9WHBvatgkuRr/SL31wBOEupaMMJ6koRE6Ld0ew iat-mode=0
 Bridge obfs4 78.46.188.239:37356 5A2D2F4158D0453E00C7C176978D3F41D69C45DB cert=3c0SwxpOisbohNxEc4tb875RVW8eOu1opRTVXJhafaKA/PNNtI7ElQIVOVZg1AdL5bxGCw iat-mode=0
--- a/briar-android/build.gradle
+++ b/briar-android/build.gradle
@@ -19,11 +19,15 @@ android {
 	compileSdkVersion 30
 	buildToolsVersion '30.0.2'

+	packagingOptions {
+		doNotStrip '**/*.so'
+	}
+
 	defaultConfig {
 		minSdkVersion 16
 		targetSdkVersion 29
-		versionCode 10217
-		versionName "1.2.17"
+		versionCode 10218
+		versionName "1.2.18"
 		applicationId "org.briarproject.briar.android"

 		vectorDrawables.useSupportLibrary = true
Author	SHA1	Message	Date
akwizgran	51794424ce	Bump version numbers for 1.2.18 release.	2021-03-11 15:25:32 +00:00
Torsten Grote	5db099bae6	Merge branch 'update-bridges' into 'master' Update list of Tor bridges See merge request briar/briar!1403	2021-03-11 15:20:11 +00:00
Torsten Grote	a2faa3bd3b	Merge branch '1612-do-not-strip-libs' into 'master' Don't strip libraries even if the NDK is installed See merge request briar/briar!1401	2021-03-11 15:14:20 +00:00
akwizgran	a3fb7b5680	Update list of Tor bridges.	2021-03-11 14:24:46 +00:00
akwizgran	2fb4825b8f	Don't strip libraries even if the NDK is installed. This allows reproducible builds regardless of whether the NDK is installed.	2021-03-11 12:20:41 +00:00