-
-
Notifications
You must be signed in to change notification settings - Fork 1.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Rewrite auto upload #615
Rewrite auto upload #615
Changes from all commits
b5a2adf
4151767
699ca26
13b864a
e4f483c
8051c67
07981f0
1973705
4e90222
7806ff2
9e44de9
a24d14f
8a978a2
2c92eaf
0b9187d
37f31c5
6aba87e
fe4c44a
f5f115e
c94f782
eeb72d1
5dcdcaf
c1f896a
deb35e5
e996a3d
6266be2
3fdd90c
cca154a
0fb06da
c8785b7
0c8beeb
df50766
172432d
52d3671
b78051c
2be9cec
54545a9
2a3e38d
1e90535
697b05f
f2d508a
6ea9d1e
123e812
3b143a9
fbdcfce
7f28c35
4068eb5
ee0c112
2015851
050fb09
d1dc7b0
15101bf
5e4ad8a
284eba8
8a56201
9fcda73
79fb4e8
623a483
bd9a12a
172da07
a568b5d
0ee60c5
5c3cd5f
91c28ee
ead3c16
16da980
1374320
c867b54
4ef5bc8
2d584ad
7daf7a1
6d98473
6032548
ebeb520
a333ead
048b7f7
c486b81
9831918
38234af
ab266f3
d734e8a
9ce087e
717e4b2
e4c306a
115c9a7
9901a80
140f2d9
66c2a80
3860b94
91257c8
4d6cc11
f95446e
5548d17
9960434
9ff5f2b
759d0df
602b3c1
8804a01
004cfd5
8bfdd00
49c27b1
c935617
488c41d
4bf833c
3b755d4
96cfa5d
80de60a
065cbd9
56a9998
e245b1f
bdb3a56
5e5e9b6
316554f
aa10589
c09f9e9
0be1f75
4c86922
1bd5113
650a09d
8f3c052
01e9a35
9d45479
5de19e2
b2e8cff
62126da
16d81b4
f13b1f2
b3e668f
bb20395
de3fe5e
832f2c4
35284f9
4f461b7
c974969
a53e289
5fee93d
b611874
c5f748d
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,6 +8,9 @@ | |
buildscript { | ||
repositories { | ||
jcenter() | ||
maven { | ||
url 'https://oss.sonatype.org/content/repositories/snapshots/' | ||
} | ||
} | ||
dependencies { | ||
classpath 'com.android.tools.build:gradle:2.2.3' | ||
|
@@ -20,7 +23,7 @@ apply plugin: 'pmd' | |
apply plugin: 'findbugs' | ||
|
||
ext { | ||
supportLibraryVersion = '24.2.1' | ||
supportLibraryVersion = '25.0.0' | ||
|
||
travisBuild = System.getenv("TRAVIS") == "true" | ||
|
||
|
@@ -40,15 +43,18 @@ repositories { | |
dependencies { | ||
/// dependencies for app building | ||
compile name: 'touch-image-view' | ||
compile 'com.android.support:multidex:1.0.1' | ||
|
||
compile 'com.github.nextcloud:android-library:1.0.11' | ||
compile 'com.github.nextcloud:android-library:1.0.12' | ||
compile "com.android.support:support-v4:${supportLibraryVersion}" | ||
compile "com.android.support:design:${supportLibraryVersion}" | ||
compile 'com.jakewharton:disklrucache:2.0.2' | ||
compile "com.android.support:appcompat-v7:${supportLibraryVersion}" | ||
compile 'com.getbase:floatingactionbutton:1.10.1' | ||
compile 'com.google.code.findbugs:annotations:2.0.1' | ||
|
||
compile group: 'commons-io', name: 'commons-io', version: '2.4' | ||
compile 'com.google.android.gms:play-services:10.2.0' | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @schiessle any opinion on including this dependency? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I can remove it if you're absolutely against it - it's not a hard dependency, but allows us to use GCM Network manager if Play services are available on the phone which is a good thing. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Actually, let me remove it right away. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Pushed. |
||
compile 'com.github.evernote:android-job:v1.1.7' | ||
|
||
/// dependencies for local unit tests | ||
testCompile 'junit:junit:4.12' | ||
|
@@ -89,6 +95,11 @@ android { | |
htmlReport true | ||
htmlOutput file("$project.buildDir/reports/lint/lint.html") | ||
} | ||
|
||
dexOptions { | ||
javaMaxHeapSize "4g" | ||
} | ||
|
||
compileSdkVersion 24 | ||
buildToolsVersion "24.0.2" | ||
|
||
|
@@ -100,6 +111,7 @@ android { | |
testInstrumentationRunnerArgument "TEST_PASSWORD", "\"$System.env.OCTEST_APP_PASSWORD\"" | ||
testInstrumentationRunnerArgument "TEST_SERVER_URL", "\"$System.env.OCTEST_SERVER_BASE_URL\"" | ||
|
||
multiDexEnabled true | ||
applicationId "com.nextcloud.client" | ||
} | ||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<full-backup-content> | ||
<exclude domain="sharedpref" path="evernote_jobs.xml" /> | ||
<exclude domain="database" path="evernote_jobs.db" /> | ||
</full-backup-content> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I guess this is the reason, why it is not building anymore. Let me check.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@mario any reason for 25.0.0 (exact version?). I am really happy that we made it to v25 :) Since there is v25.2.0, would it be possible to move to 25.2.0 (could do that in another PR)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think there was some kind of conflict at one point in time that doesn't seem to be there anymore. Do you want this change done in this PR or in another one?
Also, should I update this?
compileSdkVersion 24
buildToolsVersion "24.0.2"
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd say we better go for a new one since we can't predict the implications this might have (already had such issues with the 24 or 23 bump where the compile target then changes the behavior since it won't be backwwards compiled for the latest version (there was in issue with file access that time)). So to not potentially create new issues for 1.4.2 I'd say, we postpone this for maybe 1.5.0.
So I's suggest keeping it this way for 1.4.2 and bump everything to latest and greatest in a new PR targeting 1.5.
What so you think @mario @tobiasKaminsky ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
K.