Skip to content
This repository has been archived by the owner on Oct 27, 2020. It is now read-only.

Remove .iml files #12

Closed
wants to merge 1 commit into from
Closed

Remove .iml files #12

wants to merge 1 commit into from

Conversation

JacobAMason
Copy link
Contributor

FtcRobotController.iml and ftc_app.iml should not have been included in the repository and have been causing a bit of confusion with the whole API 19 vs API 21 thing. These are project files which are generated at build-time and can cause JDK/SDK confusion when put on the computers of others. Another side-effect of these files being included in the repo is that they are constantly trying to sneak themselves into your commits, which is a minor annoyance, but could be made better.

Users should be following the steps in FTCTraining Manual.pdf to determine how to configure their JDK and Android SDK.

Fixes #1

@NoahAndrews
Copy link

You're not really fixing the underlying issue here. What really should be done is to add a *.iml line to the .gitignore file

@JacobAMason
Copy link
Contributor Author

@NoahAndrews I did this a while back in commit fb22997, but adding an entry to a .gitignore doesn't remove a tracked file.

@NoahAndrews
Copy link

Yeah, I'm aware of that, I really meant that both should be done.

So was that commit a pull request which actually got accepted (I'm not seeing any indication of that, but that could just mean a rebase), or are you affiliated with FIRST or Qualcomm somehow?

@JacobAMason
Copy link
Contributor Author

@NoahAndrews, yes, PR #2 is merged by commit d39389f
Here is the commit history: https://github.com/ftctechnh/ftc_app/commits/master

@NoahAndrews
Copy link

facepalm How did I miss that?

Anyway, it's great to see that they have accepted a pull request from the public before.

@JacobAMason
Copy link
Contributor Author

@NoahAndrews ha, it's cool. Yes, I think they will accept a PR given that it is very focused. Of course, we've been told not to post issues here, which is somewhat confusing to me, but they didn't say we couldn't submit pull requests, so here's hoping that this will get accepted.

@markshancock
Copy link

I agree, the iml file made my merge with 160974c a pain.

@JacobAMason
Copy link
Contributor Author

@ftctechnh @tomeng70 We had a short scrimmage over Halloween weekend and I the top issue I saw was teams getting stuck on the "Google API 19 SDK etc.. not found" when the SDK was indeed already on their systems. This problem is because these .iml files are referencing the SDK by a different name. Teams should be following the install guide, but the presence of these files is creating a misleading error.
I had somewhat anticipated this would be a problem but wasn't sure until actually seeing it "in the wild". One team had downloaded 4 copies of the SDK (~25GB!) because this error was telling them the SDK wasn't present.

@JacobAMason JacobAMason deleted the noIML branch January 27, 2016 19:42
cporter pushed a commit to cporter/ftc_app that referenced this pull request Oct 8, 2017
Use Controller from (admittedly new) libsb. Clean up resetHeading().
Peterohio pushed a commit to Peterohio/ftc_app that referenced this pull request Dec 14, 2017
 10/29 Pseudocode to code Autonmous RedAutoAudi
NanoGurus4347 pushed a commit to NanoGurus4347/ftc_app that referenced this pull request Jan 26, 2018
NanoGurus4347 pushed a commit to NanoGurus4347/ftc_app that referenced this pull request Jan 26, 2018
* Remove buildings & teapot bloat

* Remove stones & chips bloat

* Replace real Vuforia lib with a dummy one

* Load the real Vuforia lib from the FIRST folder

* Add libVuforia.so to 'doc' folder
NanoGurus4347 pushed a commit to NanoGurus4347/ftc_app that referenced this pull request Jan 26, 2018
* Remove buildings & teapot bloat

* Remove stones & chips bloat

* Replace real Vuforia lib with a dummy one

* Load the real Vuforia lib from the FIRST folder

* Add libVuforia.so to 'doc' folder

(cherry picked from Turbo - commit 145c55c)
jimflood pushed a commit to jimflood/ftc_app that referenced this pull request Jan 10, 2019
sahithi-thumuluri added a commit to 6150FTC/Main-19-20-FTC6150 that referenced this pull request Apr 4, 2019
sahithi-thumuluri pushed a commit to 6150FTC/Main-19-20-FTC6150 that referenced this pull request Apr 4, 2019
sahithi-thumuluri pushed a commit to 6150FTC/Main-19-20-FTC6150 that referenced this pull request Apr 4, 2019
notgull added a commit to 32BitRobotics/ftc_app that referenced this pull request Sep 17, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants