Remove aspectj for now.

signalapp · Nov 28, 2020 · 59f7ee6 · 59f7ee6
1 parent 6cbd68f
commit 59f7ee6
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 121 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -16,33 +16,19 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.2'
+        classpath 'com.android.tools.build:gradle:4.1.1'
         classpath 'androidx.navigation:navigation-safe-args-gradle-plugin:2.1.0'
         classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.10'
-        classpath 'com.archinamon:android-gradle-aspectj:4.2.0'
     }
 }
 
 apply plugin: 'com.android.application'
 apply plugin: 'com.google.protobuf'
 apply plugin: 'androidx.navigation.safeargs'
 apply plugin: 'witness'
-apply plugin: 'com.archinamon.aspectj-ext'
 apply from: 'translations.gradle'
 apply from: 'witness-verifications.gradle'
 
-if (getGradle().getStartParameter().getTaskRequests().toString().contains("Internal")) {
-    aspectj {
-        includeJar 'sqlcipher'
-        includeAspectsFromJar 'Signal-Android'
-        java = JavaVersion.VERSION_1_8
-    }
-} else if (getGradle().getStartParameter().getTaskRequests().toString().contains("Test")) {
-    aspectj {
-        compileTests = false
-    }
-}
-
 repositories {
     maven {
         url "https://raw.github.com/signalapp/maven/master/photoview/releases/"

diff --git a/app/src/internal/java/org/thoughtcrime/securesms/tracing/TraceAspect.java b/app/src/internal/java/org/thoughtcrime/securesms/tracing/TraceAspect.java
diff --git a/app/witness-verifications.gradle b/app/witness-verifications.gradle
@@ -420,9 +420,6 @@ dependencyVerification {
         ['org.apache.httpcomponents:httpclient-android:4.3.5',
          '6f56466a9bd0d42934b90bfbfe9977a8b654c058bf44a12bdc2877c4e1f033f1'],
 
-        ['org.aspectj:aspectjrt:1.9.4',
-         '4ff12340d4f1197b95fc9d53dd43b7ada6150426d685778979ceca4304361698'],
-
         ['org.conscrypt:conscrypt-android:2.0.0',
          '400ca559a49b860a82862b22cee0e3110764bdcf7ee7c79e7479895c25cdfc09'],