Dummy Beta PR

[tobiasKaminsky]

This will never be merged, but is to see Travis, discuss the beta version

[tobiasKaminsky]

@AndyScherzinger I have seen that you added a lot of changes here.
Are these changes also in some PRs for the master? As this beta will never be merged back to master, these changes might get lost...?

In general, to avoid this, I suggest to put this all to PRs against "master".
I have written a script that checks if all already included PRs are up to date and otherwise I merge them.
Therefore please update (or create) your PRs and I will manage the rest ;)

[AndyScherzinger]

Yes, all the changes I made have also been made to material_buttons or material_fab respectively, so all changes are also part of other PRs targeting master.

[AndyScherzinger]

could we also add #1220 to the beta for field testing the technical change? 😃

[AndyScherzinger]

@tobiasKaminsky did you miss to push some changes?
-compile:

[javac] Compiling 157 source files to /home/travis/build/owncloud/android/bin/classes

[javac] /home/travis/build/owncloud/android/src/com/owncloud/android/ui/activity/Preferences.java:466: error: cannot find symbol

[javac]                pAboutApp.setSummary(String.format(getString(R.string.about_version), BuildConfig.VERSION_CODE));

[javac]                                                                                                 ^

[javac]   symbol:   variable VERSION_CODE

[javac]   location: class BuildConfig

[javac] /home/travis/build/owncloud/android/src/com/owncloud/android/ui/activity/Preferences.java:490: error: cannot find symbol

[javac]                     Integer currentVersion = BuildConfig.VERSION_CODE;

[javac]                                                         ^

[javac]   symbol:   variable VERSION_CODE

[javac]   location: class BuildConfig

Which should imho be Build.Ver... not BuildConfig.Ver...

Don't know which branch brought in this change.

[tobiasKaminsky]

@AndyScherzinger you can add #1220 to the beta branch.
Just write about it in the changelog.
But please test it properly :)

Regarding the failing travis I will look soon.

[tobiasKaminsky]

Regarding BuildConfig: The variable is generated by gradle.
So currently I do not know how to do that...

[AndyScherzinger]

Added #1277 to the beta branch and tested it with the branch head. Works on my Nexus5 running Android 6, changelog has been updated accordingly @tobiasKaminsky

[davivel]

@AndyScherzinger , seems you forgot pushing something in the library repo.

[AndyScherzinger]

Hmmm, I didn't change anything in the lib just pulled my branch and had to commit due to resolving merge conflicts. Maybe that led to this?

[AndyScherzinger]

@davivel how can I fix this (not a git pro). I can push the "change" to the lib repo which means I woul dpush a senseless, empty commit its master, which is most likely not what you would want me to do. Any help very much appreciated!

[tobiasKaminsky]

@AndyScherzinger You need to got to android-lib, checkout the master branch and reset to head.
Then change back to the android project and do a commit. This will commit the subproject revision number.
If you need help I am on irc

[AndyScherzinger]

Yeah, it worked! Thanks @tobiasKaminsky so we are back to the BuildConfig.VERSION_CODE compile error now since ant doesn't seem to generate this class :(
Update this seems to be an ANT issue since "the internet" is telling me that Version_Code etc. is generated using gradle but it seems this won't be done when using ant which just generates the debug flag... :(

[AndyScherzinger]

@tobiasKaminsky @jancborchardt @davivel @masensio just wanted to let you know that I am forced to pause dev activities until I find a proper USB A->C cable (which if you want a standard compliant is quite a pain and atm rather impossible) due to a phone swap.

[jancborchardt]

@AndyScherzinger sure, no worries! Maybe this can be of help: Google engineer writing Amazon reviews on USB-C cables that don't work

[AndyScherzinger]

@jancborchardt Yeah, I know that one and also the Spreadsheet. Unfortunately the compliant cables aren't available at the moment probably due to the demand (for compliant cables).

[tobiasKaminsky]

Just use an emulator :)

[AndyScherzinger]

Na, nothing beats a physical device :)

[AndyScherzinger]

@tobiasKaminsky I finally found the time to redo and test drive the compile target bump to marshmallow #1220 - It is running on my phone just fine uploads/downloads (also instant) have been tested. So this should be fine and thus I pushed/merged it onto the beta branch. Hope this is fine with you as I said I tested the merged version before I pushed it on GH.

[tobiasKaminsky]

@AndyScherzinger do you have time to merge your PRs into beta?
#1193 #1415 #1556
That would be great :)

[AndyScherzinger]

They are all on the beta branch already 😁

[tobiasKaminsky]

For example #1277? I have a status script that checks if the branch is included in beta.
Also if I try to merge this PR I get a lots of changes.

[AndyScherzinger]

--> #1277 (comment)
The changes are probably due to the rebase

[tobiasKaminsky]

Then I consider those PRs as integrated.

[tobiasKaminsky]

@AndyScherzinger In order to have my script working correctly please do not rebase the branches to get them into beta. Please use merge instead as this will keep track of the history.

[tobiasKaminsky]

Are there open PRs that we should merge into beta?

[AndyScherzinger]

Okay, good to know. Unfortunately all of my open PRs are rebased atm... :(

[davivel]

Beta process will change soon. This PR is not needed anymore. Closing then.