Android Studio 2.3.3

proguard issues still not fixed in canary
pull/574/head
Alex Baker 9 years ago
parent 44dea88fe2
commit 39246f192a

@ -23,5 +23,5 @@ before_install:
- adb shell input keyevent 82 & - adb shell input keyevent 82 &
script: script:
- ./gradlew :app:lintGoogleplayDebug - ./gradlew :app:lintGoogleplayProdDebug
- ./gradlew :app:connectedGoogleplayDebugAndroidTest - ./gradlew :app:connectedGoogleplayProdDebugAndroidTest

@ -7,13 +7,10 @@ task wrapper(type: Wrapper) {
buildscript { buildscript {
repositories { repositories {
jcenter() jcenter()
maven {
url 'https://maven.google.com'
}
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.0.0-alpha3' classpath 'com.android.tools.build:gradle:2.3.3'
} }
} }
@ -36,8 +33,10 @@ android {
versionCode 457 versionCode 457
versionName "4.9.14" versionName "4.9.14"
targetSdkVersion 25 targetSdkVersion 25
minSdkVersion 15
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
jackOptions {
enabled true
}
} }
signingConfigs { signingConfigs {
@ -60,7 +59,7 @@ android {
} }
} }
flavorDimensions 'store' flavorDimensions 'store', 'env'
productFlavors { productFlavors {
generic { generic {
@ -72,6 +71,14 @@ android {
amazon { amazon {
dimension 'store' dimension 'store'
} }
dev {
minSdkVersion 21
dimension 'env'
}
prod {
minSdkVersion 15
dimension 'env'
}
} }
if (project.hasProperty('keyAlias') && if (project.hasProperty('keyAlias') &&

@ -137,7 +137,7 @@ public class BasicPreferences extends InjectingPreferenceActivity implements
}); });
findPreference(R.string.TLA_menu_donate).setOnPreferenceClickListener(preference -> { findPreference(R.string.TLA_menu_donate).setOnPreferenceClickListener(preference -> {
if (BuildConfig.FLAVOR.equals("googleplay")) { if (BuildConfig.FLAVOR_store.equals("googleplay")) {
newDonationDialog().show(getFragmentManager(), FRAG_TAG_DONATION); newDonationDialog().show(getFragmentManager(), FRAG_TAG_DONATION);
} else { } else {
startActivity(new Intent(Intent.ACTION_VIEW).setData(Uri.parse("http://tasks.org/donate"))); startActivity(new Intent(Intent.ACTION_VIEW).setData(Uri.parse("http://tasks.org/donate")));
@ -214,7 +214,7 @@ public class BasicPreferences extends InjectingPreferenceActivity implements
requires(R.string.get_plugins, atLeastJellybeanMR1(), R.string.p_purchased_dashclock); requires(R.string.get_plugins, atLeastJellybeanMR1(), R.string.p_purchased_dashclock);
requires(R.string.settings_localization, atLeastJellybeanMR1(), R.string.p_language, R.string.p_layout_direction); requires(R.string.settings_localization, atLeastJellybeanMR1(), R.string.p_language, R.string.p_layout_direction);
if (!BuildConfig.FLAVOR.equals("googleplay")) { if (!BuildConfig.FLAVOR_store.equals("googleplay")) {
requires(R.string.settings_general, false, R.string.synchronization); requires(R.string.settings_general, false, R.string.synchronization);
requires(R.string.privacy, false, R.string.p_collect_statistics); requires(R.string.privacy, false, R.string.p_collect_statistics);
} }

Loading…
Cancel
Save