Skip to content

Commit

Permalink
Merge branch 'buildSrc' into testroid
Browse files Browse the repository at this point in the history
  • Loading branch information
JosephBK authored Jul 16, 2019
2 parents ac62d49 + 3ee860c commit 5716fe7
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
4 changes: 3 additions & 1 deletion app/src/lumen/java/com/cliqz/browser/app/BrowserApp.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
import com.cliqz.browser.CliqzConfig;
import com.cliqz.browser.purchases.PurchasesManager;
import com.revenuecat.purchases.Purchases;
import de.blinkt.openvpn.core.StatusListener;
import io.sentry.Sentry;
import io.sentry.android.AndroidSentryClientFactory;

import javax.inject.Inject;

Expand Down Expand Up @@ -35,7 +38,6 @@ public void init() {
getAppComponent().inject(this);
setupSubscriptionSDK();
}

//@TODO Remove hardcoded imports once the integration with server is done
private void importVpnProfiles() {
final ProfileManager profileManager = ProfileManager.getInstance(getApplicationContext());
Expand Down
1 change: 1 addition & 0 deletions buildSrc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,4 @@ compileTestKotlin {
jvmTarget = "1.8"
}
}

2 changes: 1 addition & 1 deletion buildSrc/src/main/java/com/cliqz/gradle/CliqzPlugin.kt
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class CliqzPlugin: Plugin<Project> {
it.dependsOn(assembleProvider, assembleTestProvider)
}
}

private fun createCliqzConfigTasks(project: Project, variant: ApplicationVariant) {
val buildConfigProvider = variant.generateBuildConfigProvider
val javaCompileProvider = variant.javaCompileProvider
Expand Down

0 comments on commit 5716fe7

Please sign in to comment.