Skip to content

armgit / haven

Public Imported from GitHub
0

Haven is for people who need a way to protect their personal spaces and possessions without compromising their own privacy, through an Android app and on-device sensors

Update project/libraries/tools to latest stable + fix breakage on older API

fattirefb988cd59a62
diff --git a/build.gradle b/build.gradle
index 2015884..4f214cc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,7 +11,6 @@ buildscript {
}
-
/* gets the version name from the latest Git tag, stripping the leading v off */
def getVersionName = { ->
def stdout = new ByteArrayOutputStream()
@@ -39,19 +38,19 @@ allprojects {
version_number=getVersionName()
group_info="haven"
signal_version="2.3.0"
- buildToolsVersion="26.0.2"
- compileSdkVersion=25
+ buildToolsVersion="27.0.3"
+ compileSdkVersion=27
minSdkVersion=16
- targetSdkVersion=25
- appcompat='com.android.support:appcompat-v7:25.2.0'
+ targetSdkVersion=27
+ appcompat='com.android.support:appcompat-v7:27.0.3'
}
}
android {
- compileSdkVersion 25
- buildToolsVersion '26.0.2'
+ compileSdkVersion 27
+ buildToolsVersion '27.0.3'
packagingOptions {
exclude 'META-INF/LICENSE.txt'
@@ -75,13 +74,13 @@ android {
versionName getVersionName()
archivesBaseName = "Haven-$versionName"
minSdkVersion 16
- targetSdkVersion 25
+ targetSdkVersion 27
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_7
targetCompatibility JavaVersion.VERSION_1_7
}
multiDexEnabled true
-
+ vectorDrawables.useSupportLibrary = true
}
buildTypes {
@@ -103,10 +102,10 @@ android {
}
dependencies {
- compile 'com.android.support:support-v4:25.4.0'
- compile 'com.android.support:appcompat-v7:25.4.0'
- compile 'com.android.support:design:25.4.0'
- compile 'com.android.support:cardview-v7:25.4.0'
+ compile 'com.android.support:support-v4:27.0.2'
+ compile 'com.android.support:appcompat-v7:27.0.2'
+ compile 'com.android.support:design:27.0.2'
+ compile 'com.android.support:cardview-v7:27.0.2'
compile 'com.android.support.constraint:constraint-layout:1.0.2'
compile 'com.github.guardianproject:signal-cli-android:-SNAPSHOT'
compile 'com.github.satyan:sugar:1.5'
@@ -117,7 +116,7 @@ dependencies {
compile 'com.nanohttpd:nanohttpd-webserver:2.2.0'
compile 'me.angrybyte.picker:picker:1.3.1'
compile 'com.github.stfalcon:frescoimageviewer:0.5.0'
- compile 'com.facebook.fresco:fresco:1.4.0'
+ compile 'com.facebook.fresco:fresco:1.7.1'
compile 'com.github.derlio.waveform:library:1.0.3@aar'
compile 'org.firezenk:audiowaves:1.1@aar'
compile 'com.maxproj.simplewaveform:app:1.0.0'
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2248234..4468a4d 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-all.zip
diff --git a/src/main/java/org/havenapp/main/ListActivity.java b/src/main/java/org/havenapp/main/ListActivity.java
index 6b5d257..78da9bb 100644
--- a/src/main/java/org/havenapp/main/ListActivity.java
+++ b/src/main/java/org/havenapp/main/ListActivity.java
@@ -124,7 +124,7 @@ public class ListActivity extends AppCompatActivity {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
- Drawable drawable = ContextCompat.getDrawable(this, R.drawable.ic_arrow_forward_white);
+ Drawable drawable = ContextCompat.getDrawable(this, R.drawable.ic_play_arrow_white_24dp);
drawable = DrawableCompat.wrap(drawable);
DrawableCompat.setTint(drawable, Color.WHITE);
DrawableCompat.setTintMode(drawable, PorterDuff.Mode.SRC_IN);
diff --git a/src/main/res/layout/activity_list.xml b/src/main/res/layout/activity_list.xml
index f8bf967..73606ad 100644
--- a/src/main/res/layout/activity_list.xml
+++ b/src/main/res/layout/activity_list.xml
@@ -57,7 +57,7 @@
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="@dimen/fab_margin"
- android:src="@drawable/ic_play_arrow_white_48dp"
+ app:srcCompat="@drawable/ic_play_arrow_white_48dp"
android:tint="@android:color/white" />
</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file