Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58bc9f2d authored by Amit Kumar's avatar Amit Kumar Committed by Amit Kumar
Browse files

Fix build error because of wrong dependencies

parent 36808432

app/build.gradle

+11 −26
Original line number Diff line number Diff line
@@ -81,15 +81,11 @@ android { 
}



dependencies {

    implementation 'me.relex:circleindicator:1.2.2@aar'

    implementation 'io.github.inflationx:calligraphy3:3.1.1'

    implementation 'io.github.inflationx:viewpump:1.0.0'

    implementation 'me.relex:circleindicator:2.1.4'



    apiNougatImplementation 'org.cyanogenmod:platform.sdk:6.0'

    apiOreoImplementation files('libs/lineage-sdk.jar')



    debugImplementation 'com.amitshekhar.android:debug-db:1.0.4'



    implementation 'org.greenrobot:eventbus:3.1.1'



    // Support Libs
@@ -99,7 +95,7 @@ dependencies { 
    // Rx Java and Android

    implementation Libs.RxJava.rxAndroid

    implementation Libs.RxJava.rxJava

    implementation 'com.jakewharton.rxbinding2:rxbinding:2.1.1'

    implementation 'com.jakewharton.rxbinding3:rxbinding:3.0.0'



    // Retrofit

    implementation Libs.Retrofit.retrofit
@@ -111,34 +107,23 @@ dependencies { 
    implementation Libs.OkHttp.loggingInterceptor



    // Rx Relay

    implementation "com.jakewharton.rxrelay2:rxrelay:${rootProject.ext.rxRelayVersion}"

    implementation "com.jakewharton.rxrelay2:rxrelay:2.1.1"



    // Room

    implementation Libs.AndroidX.Room.runtime

    annotationProcessor Libs.AndroidX.Room.compiler



    // Unit test dependencies

    testImplementation "junit:junit:${rootProject.ext.junitVersion}"

    testImplementation "org.robolectric:robolectric:${rootProject.ext.robolectricVersion}"

    testImplementation "org.mockito:mockito-core:${rootProject.ext.mockitoVersion}"

    testImplementation "org.hamcrest:hamcrest-core:${rootProject.ext.hamcrestVersion}"

    testImplementation "org.hamcrest:hamcrest-library:${rootProject.ext.hamcrestVersion}"

    testImplementation "org.hamcrest:hamcrest-integration:${rootProject.ext.hamcrestVersion}"

    testImplementation Libs.junit

    testImplementation Libs.robolectric

    testImplementation "org.mockito:mockito-core:2.19.0"

    testImplementation Libs.AndroidX.Test.archCoreTesting



    // Instrumentation tests dependencies

    androidTestImplementation "junit:junit:${rootProject.ext.junitVersion}"

    androidTestImplementation "org.mockito:mockito-core:${rootProject.ext.mockitoVersion}"

    androidTestImplementation "org.mockito:mockito-android:${rootProject.ext.mockitoVersion}"

    androidTestImplementation "com.android.support:support-annotations:${rootProject.ext.supportLibraryVersion}"

    androidTestImplementation("com.android.support.test.espresso:espresso-contrib:${rootProject.ext.espressoVersion}", {

        exclude group: 'com.android.support', module: 'appcompat-v7'

        exclude group: 'com.android.support', module: 'support-v4'

        exclude group: 'com.android.support', module: 'recyclerview-v7'

        exclude group: 'com.android.support', module: 'design'

    })

    androidTestImplementation "com.android.support.test.espresso:espresso-core:${rootProject.ext.espressoVersion}"

    androidTestImplementation "com.android.support.test:runner:${rootProject.ext.runnerRulesVersion}"

    androidTestImplementation "com.android.support.test:rules:${rootProject.ext.runnerRulesVersion}"

    androidTestImplementation Libs.junit

    androidTestImplementation Libs.AndroidX.Test.espressoCore

    androidTestImplementation Libs.AndroidX.Test.runner

    androidTestImplementation Libs.AndroidX.Test.rules

    implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'

}

app/src/main/java/foundation/e/blisslauncher/BlissLauncher.java

+0 −12
Original line number Diff line number Diff line
@@ -8,9 +8,6 @@ import foundation.e.blisslauncher.core.DeviceProfile; 
import foundation.e.blisslauncher.core.IconsHandler;

import foundation.e.blisslauncher.core.customviews.WidgetHost;

import foundation.e.blisslauncher.features.launcher.AppProvider;

import io.github.inflationx.calligraphy3.CalligraphyConfig;

import io.github.inflationx.calligraphy3.CalligraphyInterceptor;

import io.github.inflationx.viewpump.ViewPump;



public class BlissLauncher extends Application {

    private IconsHandler iconsPackHandler;
@@ -26,15 +23,6 @@ public class BlissLauncher extends Application { 
    @Override

    public void onCreate() {

        super.onCreate();



        ViewPump.init(ViewPump.builder()

                .addInterceptor(new CalligraphyInterceptor(

                        new CalligraphyConfig.Builder()

                                .setDefaultFontPath("Roboto-Regular.ttf")

                                .setFontAttrId(R.attr.fontPath)

                                .build()))

                .build());



        sAppWidgetManager = AppWidgetManager.getInstance(getApplicationContext());

        sAppWidgetHost = new WidgetHost(getApplicationContext(),

                R.id.APPWIDGET_HOST_ID);

app/src/main/java/foundation/e/blisslauncher/features/launcher/LauncherActivity.java

+8 −2
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ import androidx.recyclerview.widget.RecyclerView; 
import androidx.viewpager.widget.PagerAdapter;

import androidx.viewpager.widget.ViewPager;



import com.jakewharton.rxbinding2.widget.RxTextView;

import com.jakewharton.rxbinding3.widget.RxTextView;



import java.util.ArrayList;

import java.util.Arrays;
@@ -145,9 +145,12 @@ import io.reactivex.disposables.CompositeDisposable; 
import io.reactivex.observers.DisposableObserver;

import io.reactivex.schedulers.Schedulers;

import me.relex.circleindicator.CircleIndicator;

<<<<<<< HEAD



import static android.view.View.GONE;

import static android.view.View.VISIBLE;

=======

>>>>>>> Fix build error because of wrong dependencies



public class LauncherActivity extends AppCompatActivity implements

        AutoCompleteAdapter.OnSuggestionClickListener, OnSwipeDownListener {
@@ -357,10 +360,13 @@ public class LauncherActivity extends AppCompatActivity implements 
        managedProfileReceiver = ManagedProfileBroadcastReceiver.register(this);

    }



<<<<<<< HEAD

    protected void attachBaseContext(Context context) {

        super.attachBaseContext(ViewPumpContextWrapper.wrap(context));

    }



=======

>>>>>>> Fix build error because of wrong dependencies

    public CompositeDisposable getCompositeDisposable() {

        if (mCompositeDisposable == null || mCompositeDisposable.isDisposed()) {

            mCompositeDisposable = new CompositeDisposable();

build.gradle

+0 −20
Original line number Diff line number Diff line
@@ -51,23 +51,3 @@ subprojects { 
        }

    }

}
 


ext {

    compileSdkVersion = 27

    minSdkVersion = 24

    targetSdkVersion = 27

    sourceCompatibilityVersion = '1.7'

    targetCompatibilityVersion = '1.7'

    supportLibraryVersion = '27.1.1'

    junitVersion = '4.12'

    mockitoVersion = '2.16.0'

    hamcrestVersion = '1.3'

    daggerVersion = '2.15'

    archVersion = '1.1.0'

    rxJavaVersion = '2.1.10'

    rxAndroidVersion = '2.0.2'

    rxRelayVersion = '2.0.0'

    robolectricVersion = '3.7.1'

    espressoVersion = '3.0.1'

    runnerRulesVersion = '1.0.0'

}

buildSrc/src/main/java/foundation/e/blisslauncher/buildsrc/Dependencies.kt

+4 −2
Original line number Diff line number Diff line
@@ -74,10 +74,12 @@ object Libs { 
            const val rules = "androidx.test:rules:$version"



            const val espressoCore = "androidx.test.espresso:espresso-core:3.2.0"

        }



            const val espressoContrib = "androidx.test.espresso:espresso-contrib:3.2.0"

            const val espressoIntents = "androidx.test.espresso:espresso-intents:3.2.0"

            const val archCoreTesting = "androidx.arch.core:core-testing:2.0.1"



        }



        const val preference = "androidx.preference:preference:1.1.0-rc01"



        const val constraintlayout = "androidx.constraintlayout:constraintlayout:2.0.0-beta2"