Skip to content

Commit

Permalink
Update project/libraries/tools to latest stable + fix breakage on old…
Browse files Browse the repository at this point in the history
…er API

Tested on real device w/7.1 and emulator w/API 16.
  • Loading branch information
fat-tire committed Dec 23, 2017
1 parent 8b56cda commit fb988cd
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 17 deletions.
27 changes: 13 additions & 14 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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'
Expand All @@ -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 {
Expand All @@ -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'
Expand All @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion src/main/java/org/havenapp/main/ListActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ public void onSwiped(RecyclerView.ViewHolder viewHolder, int direction) {

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);
Expand Down
2 changes: 1 addition & 1 deletion src/main/res/layout/activity_list.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

0 comments on commit fb988cd

Please sign in to comment.