Skip to content
Snippets Groups Projects
Commit 130b0a0a authored by Jawnnypoo's avatar Jawnnypoo
Browse files

Remove accidental views, target 24, and switch versioning scheme

parent 0d07e906
No related branches found
No related tags found
No related merge requests found
Pipeline #
def versionMajor = 2
def versionMinor = 2
def versionPatch = 6
def versionBuild = 1 // bump for dogfood builds, public betas, etc.
apply plugin: 'com.android.application'
apply plugin: 'io.fabric'
apply plugin: 'com.neenbedankt.android-apt'
 
android {
compileSdkVersion 23
buildToolsVersion "23.0.3"
compileSdkVersion 24
buildToolsVersion "24.0.0"
 
project.ext {
LABCOAT_FABRIC_KEY = project.hasProperty("LABCOAT_FABRIC_KEY") ? project.LABCOAT_FABRIC_KEY : "";
Loading
Loading
@@ -12,15 +17,15 @@ android {
defaultConfig {
applicationId "com.commit451.gitlab"
minSdkVersion 16
targetSdkVersion 23
targetSdkVersion 24
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
versionCode 226
versionName "2.2.6"
versionCode versionMajor * 1000000 + versionMinor * 10000 + versionPatch * 100 + versionBuild
versionName "${versionMajor}.${versionMinor}.${versionPatch}"
manifestPlaceholders = [fabric_key: project.ext.LABCOAT_FABRIC_KEY]
}
buildTypes {
release {
minifyEnabled false
minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
ext.enableCrashlytics = true
}
Loading
Loading
@@ -42,15 +47,15 @@ dependencies {
debugCompile 'com.squareup.leakcanary:leakcanary-android:1.3.1'
releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.3.1'
 
compile 'com.android.support:appcompat-v7:23.4.0'
compile 'com.android.support:design:23.4.0'
compile 'com.android.support:recyclerview-v7:23.4.0'
compile 'com.android.support:cardview-v7:23.4.0'
compile 'com.android.support:palette-v7:23.4.0'
compile 'com.android.support:customtabs:23.4.0'
compile 'com.squareup.retrofit2:retrofit:2.0.2'
compile 'com.android.support:appcompat-v7:24.0.0'
compile 'com.android.support:design:24.0.0'
compile 'com.android.support:recyclerview-v7:24.0.0'
compile 'com.android.support:cardview-v7:24.0.0'
compile 'com.android.support:palette-v7:24.0.0'
compile 'com.android.support:customtabs:24.0.0'
compile 'com.squareup.retrofit2:retrofit:2.1.0'
compile 'com.github.aurae.retrofit2:converter-logansquare:1.4.0'
compile('com.squareup.retrofit2:converter-simplexml:2.0.2') {
compile('com.squareup.retrofit2:converter-simplexml:2.1.0') {
exclude group: 'xpp3', module: 'xpp3'
exclude group: 'stax', module: 'stax-api'
exclude group: 'stax', module: 'stax'
Loading
Loading
@@ -60,10 +65,10 @@ dependencies {
compile 'com.squareup.picasso:picasso:2.5.2'
compile 'com.jakewharton.picasso:picasso2-okhttp3-downloader:1.0.2'
compile 'com.squareup:otto:1.3.8'
compile 'io.reactivex:rxjava:1.1.5'
compile 'io.reactivex:rxjava:1.1.6'
compile 'io.reactivex:rxandroid:1.2.0'
compile 'com.jakewharton:butterknife:8.0.1'
apt 'com.jakewharton:butterknife-compiler:8.0.1'
compile 'com.jakewharton:butterknife:8.1.0'
apt 'com.jakewharton:butterknife-compiler:8.1.0'
compile 'com.jakewharton.timber:timber:4.1.2'
apt 'com.bluelinelabs:logansquare-compiler:1.3.7'
compile 'com.bluelinelabs:logansquare:1.3.7'
Loading
Loading
@@ -89,7 +94,7 @@ dependencies {
compile 'com.wdullaer:materialdatetimepicker:2.3.0'
compile 'com.wefika:flowlayout:0.4.1'
compile 'com.github.novoda:simple-chrome-custom-tabs:0.1.3-rc1'
compile('com.crashlytics.sdk.android:crashlytics:2.5.5@aar') {
compile('com.crashlytics.sdk.android:crashlytics:2.5.7@aar') {
transitive = true;
}
 
Loading
Loading
Loading
Loading
@@ -20,7 +20,8 @@ public class LabelAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
private static final int TYPE_ITEM = 0;
private static final int TYPE_FOOTER = 1;
 
private static final int FOOTER_COUNT = 1;
//TODO bring this back maybe?
private static final int FOOTER_COUNT = 0;
 
private Listener mListener;
 
Loading
Loading
Loading
Loading
@@ -66,7 +66,8 @@ public class SectionsPagerAdapter extends FragmentPagerAdapter {
Timber.d("Milestones are disabled");
mDisabledSections.add(MILESTONES_POS);
}
if (!project.isSnippetsEnabled()) {
//TODO change this back when we do snippets
if (true){//!project.isSnippetsEnabled()) {
Timber.d("Snippets are disabled");
mDisabledSections.add(SNIPPETS_POS);
}
Loading
Loading
Loading
Loading
@@ -120,7 +120,8 @@
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp">
android:layout_marginBottom="8dp"
android:visibility="gone">
 
<com.commit451.gitlab.view.LabCoatProgressView
android:id="@+id/labels_progress"
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment