diff --git a/briar-android-tests/build.gradle b/briar-android-tests/build.gradle index 858711df4729ca324cbfcfd851e60d027b647352..d9dcdc2d052d662c1c572b659e7974fd82537fd9 100644 --- a/briar-android-tests/build.gradle +++ b/briar-android-tests/build.gradle @@ -34,6 +34,16 @@ dependencies { compile 'com.android.support:appcompat-v7:23.2.0' testApt 'com.google.dagger:dagger-compiler:2.0.2' provided 'javax.annotation:jsr250-api:1.0' - compile 'cglib:cglib-nodep:3.1' testCompile project(':briar-tests') } + +dependencyVerification { + verify = [ + 'com.android.support:appcompat-v7:14ab04eb2e3f302a082b79c308f6283d21909d1feb831a4e117cdacdad70adb7', + 'com.google.dagger:dagger:84c0282ed8be73a29e0475d639da030b55dee72369e58dd35ae7d4fe6243dcf9', + 'com.google.dagger:dagger-compiler:b74bc9de063dd4c6400b232231f2ef5056145b8fbecbf5382012007dd1c071b3', + 'com.android.support:support-v4:992666398b80724a2f95ea3d7bf7c3d94fb810dcba7ae1aa6e38c0d6120d2603', + 'com.android.support:support-annotations:7f21659b084da073b77b6f7fe7ab250c4f23346238d4efdbbbb937e017ae4693', + ] + +} diff --git a/briar-android/AndroidManifest.xml b/briar-android/AndroidManifest.xml index 92340fd50e1fe3843409520923ecdcc18900d0f3..cab5c80b94ca3db32355596785e7ee1a249a4138 100644 --- a/briar-android/AndroidManifest.xml +++ b/briar-android/AndroidManifest.xml @@ -67,6 +67,7 @@ </activity> <activity android:name=".android.SplashScreenActivity" + android:theme="@style/BriarThemeNoActionBar.Default" android:label="@string/app_name"> <intent-filter> <action android:name="android.intent.action.MAIN"/> diff --git a/briar-android/build.gradle b/briar-android/build.gradle index c3a03b93a7c0761c4e1a9f7bcd62a54ce5a59a25..81228e91863e36d784813798f1c84c57615a3254 100644 --- a/briar-android/build.gradle +++ b/briar-android/build.gradle @@ -33,8 +33,6 @@ dependencies { compile "de.hdodenhof:circleimageview:2.0.0" apt 'com.google.dagger:dagger-compiler:2.0.2' provided 'javax.annotation:jsr250-api:1.0' - - compile 'cglib:cglib-nodep:3.1' } dependencyVerification { @@ -48,6 +46,7 @@ dependencyVerification { 'com.android.support:recyclerview-v7:7606373da0931a1e62588335465a0e390cd676c98117edab29220317495faefd', 'info.guardianproject.panic:panic:a7ed9439826db2e9901649892cf9afbe76f00991b768d8f4c26332d7c9406cb2', 'info.guardianproject.trustedintents:trustedintents:6221456d8821a8d974c2acf86306900237cf6afaaa94a4c9c44e161350f80f3e', + 'com.android.support:support-annotations:f347a35b9748a4103b39a6714a77e2100f488d623fd6268e259c177b200e9d82' ] } diff --git a/briar-api/build.gradle b/briar-api/build.gradle index fc84125c8058c7c72e72615e73d990b903200000..71e8c70be037a51570c625109562329307ed0d07 100644 --- a/briar-api/build.gradle +++ b/briar-api/build.gradle @@ -15,11 +15,11 @@ dependencies { dependencyVerification { verify = [ -// 'javax.inject:javax.inject:91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff', -// 'com.google.inject:guice:7c0624d0986ae2bd7a8f1cf4789bcaae5b82a042a7e3d27ba3041ed7b7f2cd3a', -// 'aopalliance:aopalliance:0addec670fedcd3f113c5c8091d783280d23f75e3acb841b61a9cdb079376a08', -// 'org.sonatype.sisu.inject:cglib:42e1dfb26becbf1a633f25b47e39fcc422b85e77e4c0468d9a44f885f5fa0be2', -// 'asm:asm:333ff5369043975b7e031b8b27206937441854738e038c1f47f98d072a20437a', + 'com.google.dagger:dagger:84c0282ed8be73a29e0475d639da030b55dee72369e58dd35ae7d4fe6243dcf9', + 'com.google.dagger:dagger-compiler:b74bc9de063dd4c6400b232231f2ef5056145b8fbecbf5382012007dd1c071b3', + 'javax.inject:javax.inject:91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff', + 'com.google.dagger:dagger-producers:99ec15e8a0507ba569e7655bc1165ee5e5ca5aa914b3c8f7e2c2458f724edd6b', + 'com.google.guava:guava:d664fbfc03d2e5ce9cab2a44fb01f1d0bf9dfebeccc1a473b1f9ea31f79f6f99', ] }