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

Commit 70f1c949 authored by Amit's avatar Amit
Browse files

Upgrade gradle version and remove crashlytics from release build

parent 8e5fda94

app/build.gradle

+7 −11
Original line number Diff line number Diff line
@@ -49,8 +49,8 @@ dependencies { 


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



    implementation 'com.crashlytics.sdk.android:crashlytics:2.9.5'

    implementation 'com.google.firebase:firebase-core:16.0.3'

    debugImplementation 'com.crashlytics.sdk.android:crashlytics:2.9.5'

    debugImplementation 'com.google.firebase:firebase-core:16.0.3'



    implementation 'org.greenrobot:eventbus:3.1.1'
@@ -66,12 +66,12 @@ dependencies { 
    implementation 'com.jakewharton.rxbinding2:rxbinding:2.1.1'



    // Retrofit

    implementation 'com.squareup.retrofit2:retrofit:2.3.0'

    implementation 'com.squareup.retrofit2:converter-gson:2.3.0'

    implementation 'com.squareup.retrofit2:adapter-rxjava2:2.3.0'

    implementation 'com.squareup.retrofit2:retrofit:2.4.0'

    implementation 'com.squareup.retrofit2:converter-gson:2.4.0'

    implementation 'com.squareup.retrofit2:adapter-rxjava2:2.4.0'



    // Okhttp

    implementation 'com.squareup.okhttp3:logging-interceptor:3.9.0'

    implementation 'com.squareup.okhttp3:logging-interceptor:3.10.0'



    // Rx Relay

    implementation "com.jakewharton.rxrelay2:rxrelay:${rootProject.ext.rxRelayVersion}"
@@ -100,8 +100,4 @@ dependencies { 
    androidTestImplementation "com.android.support.test:rules:${rootProject.ext.runnerRulesVersion}"

}





repositories {

    mavenCentral()

}

apply plugin: 'com.google.gms.google-services'

app/src/main/java/org/indin/blisslaunchero/features/launcher/LauncherActivity.java

+4 −4
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ package org.indin.blisslaunchero.features.launcher; 


import static android.view.View.GONE;

import static android.view.View.VISIBLE;



import static cyanogenmod.providers.WeatherContract.WeatherColumns.TempUnit.CELSIUS;

import static cyanogenmod.providers.WeatherContract.WeatherColumns.TempUnit.FAHRENHEIT;

import static cyanogenmod.providers.WeatherContract.WeatherColumns.WindSpeedUnit.KPH;
@@ -73,7 +74,6 @@ import org.indin.blisslaunchero.framework.utils.GraphicsUtil; 
import org.json.JSONArray;

import org.json.JSONObject;



import com.crashlytics.android.Crashlytics;

import com.jakewharton.rxbinding2.widget.RxTextView;



import android.Manifest;
@@ -130,6 +130,7 @@ import android.widget.LinearLayout; 
import android.widget.ScrollView;

import android.widget.TextView;

import android.widget.Toast;



import cyanogenmod.weather.WeatherInfo;

import cyanogenmod.weather.util.WeatherUtils;

import io.reactivex.Observable;
@@ -1016,7 +1017,6 @@ public class LauncherActivity extends AppCompatActivity implements 
        List<UsageStats> usageStats = appUsageStats.getUsageStats();

        if (usageStats.size() > 0) {

            int i = 0;

            Crashlytics.log("Size of usage stats: " + usageStats.size());

            while (suggestedAppsGridLayout.getChildCount() < 4 && i < usageStats.size()) {

                AppItem appItem = AppUtils.createAppItem(this, usageStats.get(i).getPackageName());

                if (appItem != null) {
@@ -2324,8 +2324,8 @@ public class LauncherActivity extends AppCompatActivity implements 
                    (int) (x + mDeviceProfile.iconSizePx / 2),

                    (int) (y + mDeviceProfile.iconSizePx / 2));

            if (Rect.intersects(r, r2)) {

                float vx = r.left + (r.right - r.left) / 2;

                float vy = r.top + (r.bottom - r.top) / 2;

                float vx = r.left + (float) (r.right - r.left) / 2;

                float vy = r.top + (float) (r.bottom - r.top) / 2;

                float distance = (float) Math.hypot(vx - x, vy - y);

                if (minDistance > distance) {

                    minDistance = distance;

app/src/main/java/org/indin/blisslaunchero/features/launcher/LoadAppsTask.java

+1 −2
Original line number Diff line number Diff line
@@ -16,13 +16,12 @@ 
package org.indin.blisslaunchero.features.launcher;



import android.content.Context;

import android.os.AsyncTask;



import org.indin.blisslaunchero.framework.utils.AppUtils;



import java.lang.ref.WeakReference;



import io.fabric.sdk.android.services.concurrency.AsyncTask;



public class LoadAppsTask extends AsyncTask<Void, Void, AllAppsList> {



    private final WeakReference<Context> mContext;

app/src/main/java/org/indin/blisslaunchero/framework/customviews/CustomAnalogClock.java

+2 −0
Original line number Diff line number Diff line
@@ -118,6 +118,7 @@ public class CustomAnalogClock extends View { 


        mHandsOverlay = new HandsOverlay(Hhand, Mhand, SHand).withScale(sizeScale);

        mHandsOverlay.setShowSeconds(true);

        setScale((float) BlissLauncher.getApplication(mContext).getDeviceProfile().iconSizePx / mDialWidth);

    }



    public void setFace(Drawable face) {
@@ -200,6 +201,7 @@ public class CustomAnalogClock extends View { 
                    + (h / 2));

        }





        mFace.draw(canvas);

        mHandsOverlay.onDraw(canvas, cX, cY, w, h, mCalendar, sizeChanged);

build.gradle

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ buildscript { 
        }

    }

    dependencies {

        classpath 'com.android.tools.build:gradle:3.2.0-beta01'

        classpath 'com.android.tools.build:gradle:3.3.0-alpha08'

        classpath 'io.fabric.tools:gradle:1.25.4'

        classpath 'com.google.gms:google-services:4.0.0'

    }