jmspring
commented
10 years ago Changes to java files as part of the refactor? Just curious...
-j
On Aug 9, 2014, at 10:59 AM, yaronyg notifications@github.com wrote:
Jason had an awesome idea to refactor us into gradle modules. This made dependency management easier and it also made using IntelliJ much easier since you could open all of Production in a single project window! It was a great change. Unfortunately it surfaced two bugs that we didn't find during normal testing.
The first bug had to do with the POMs being generated in Maven having the wrong ID and version. But that was trivial to fix.
The second bug is in IntelliJ and basically IntelliJ does not handle gradle subprojects in v13 correctly. They had a regression and according to http://youtrack.jetbrains.com/issue/IDEA-120939#comment=27-777233 they don't plan to fix it. I tried their work around but it didn't work. The issue is that when running in IntelliJ the resources directory for modules aren't properly added to the path and so resources aren't found during execution. Since we need those resources that was a show stopper.
IntelliJ says to go to v14 but v14 is an EAP and not even a beta yet (by their own warning language) and anyway uses a newer version of Android that isn't compatible with our version and we don't want to upgrade right now. So we had to lose a good chunk of productivity by the whole team while we pulled out the changes. Sigh.
You can merge this Pull Request by running
git pull https://github.com/yaronyg/thali-1 master Or view, comment on, or merge it at:
https://github.com/thaliproject/thali/pull/55
Commit Summary
Revert "Merge pull request #48 from jpoon/master" Fix what we broke in the revert Missed a gradle update and a few comments in build files File Changes
A Production/.gitignore (6) A Production/ThaliDeviceHub/.gitignore (20) M Production/ThaliDeviceHub/Universal/build.gradle (4) M Production/ThaliDeviceHub/Universal/gradle/wrapper/gradle-wrapper.properties (1) A Production/ThaliDeviceHub/android/.gitignore (4) R Production/ThaliDeviceHub/android/android/.gitignore (0) A Production/ThaliDeviceHub/android/android/build.gradle (45) A Production/ThaliDeviceHub/android/android/gradle/wrapper/gradle-wrapper.jar (0) R Production/ThaliDeviceHub/android/android/gradle/wrapper/gradle-wrapper.properties (4) R Production/ThaliDeviceHub/android/android/gradlew (0) R Production/ThaliDeviceHub/android/android/gradlew.bat (0) R Production/ThaliDeviceHub/android/android/lint.xml (2) R Production/ThaliDeviceHub/android/android/src/main/AndroidManifest.xml (0) R Production/ThaliDeviceHub/android/android/src/main/ic_launcher-web.png (0) R Production/ThaliDeviceHub/android/android/src/main/java/com/msopentech/thali/devicehub/android/MainActivity.java (0) R Production/ThaliDeviceHub/android/android/src/main/java/com/msopentech/thali/devicehub/android/ThaliDeviceHubService.java (0) R Production/ThaliDeviceHub/android/android/src/main/res/drawable-hdpi/ic_launcher.png (0) R Production/ThaliDeviceHub/android/android/src/main/res/drawable-mdpi/ic_launcher.png (0) R Production/ThaliDeviceHub/android/android/src/main/res/drawable-xhdpi/ic_launcher.png (0) R Production/ThaliDeviceHub/android/android/src/main/res/drawable-xxhdpi/ic_launcher.png (0) R Production/ThaliDeviceHub/android/android/src/main/res/layout/activity_main.xml (0) R Production/ThaliDeviceHub/android/android/src/main/res/layout/fragment_main.xml (0) R Production/ThaliDeviceHub/android/android/src/main/res/menu/main.xml (0) R Production/ThaliDeviceHub/android/android/src/main/res/values-w820dp/dimens.xml (0) R Production/ThaliDeviceHub/android/android/src/main/res/values/dimens.xml (0) R Production/ThaliDeviceHub/android/android/src/main/res/values/strings.xml (0) R Production/ThaliDeviceHub/android/android/src/main/res/values/styles.xml (0) M Production/ThaliDeviceHub/android/build.gradle (46) M Production/ThaliDeviceHub/android/gradle/wrapper/gradle-wrapper.properties (1) A Production/ThaliDeviceHub/android/settings.gradle (1) M Production/ThaliDeviceHub/java/build.gradle (7) M Production/ThaliDeviceHub/java/gradle/wrapper/gradle-wrapper.properties (1) A Production/ThaliDeviceHub/java/settings.gradle (2) A Production/Utilities/AndroidUtilities/AndroidUtilities/.gitignore (1) A Production/Utilities/AndroidUtilities/AndroidUtilities/build.gradle (103) A Production/Utilities/AndroidUtilities/AndroidUtilities/gradle/wrapper/gradle-wrapper.jar (0) A Production/Utilities/AndroidUtilities/AndroidUtilities/gradle/wrapper/gradle-wrapper.properties (6) A Production/Utilities/AndroidUtilities/AndroidUtilities/gradlew (164) A Production/Utilities/AndroidUtilities/AndroidUtilities/gradlew.bat (90) R Production/Utilities/AndroidUtilities/AndroidUtilities/src/androidTest/java/com/msopentech/thali/local/utilities/UtilitiesTestCase.java (0) R Production/Utilities/AndroidUtilities/AndroidUtilities/src/androidTest/java/com/msopentech/thali/utilities/android/test/AndroidBridgeManagerTest.java (0) R Production/Utilities/AndroidUtilities/AndroidUtilities/src/androidTest/java/com/msopentech/thali/utilities/android/test/AndroidEktorpCreateClientBuilderTest.java (0) R Production/Utilities/AndroidUtilities/AndroidUtilities/src/androidTest/java/com/msopentech/thali/utilities/test/RelayWebServerTest.java (0) R Production/Utilities/AndroidUtilities/AndroidUtilities/src/androidTest/java/com/msopentech/thali/utilities/test/RestTestMethods.java (0) R Production/Utilities/AndroidUtilities/AndroidUtilities/src/main/AndroidManifest.xml (0) R Production/Utilities/AndroidUtilities/AndroidUtilities/src/main/java/com/msopentech/thali/utilities/android/AndroidBridgeManager.java (0) R Production/Utilities/AndroidUtilities/AndroidUtilities/src/main/java/com/msopentech/thali/utilities/android/AndroidBridgeManagerTestActivity.java (0) R Production/Utilities/AndroidUtilities/AndroidUtilities/src/main/java/com/msopentech/thali/utilities/android/AndroidEktorpCreateClientBuilder.java (0) R Production/Utilities/AndroidUtilities/AndroidUtilities/src/main/res/drawable-hdpi/ic_launcher.png (0) R Production/Utilities/AndroidUtilities/AndroidUtilities/src/main/res/drawable-mdpi/ic_launcher.png (0) R Production/Utilities/AndroidUtilities/AndroidUtilities/src/main/res/drawable-xhdpi/ic_launcher.png (0) R Production/Utilities/AndroidUtilities/AndroidUtilities/src/main/res/values-v11/styles.xml (0) R Production/Utilities/AndroidUtilities/AndroidUtilities/src/main/res/values-v14/styles.xml (0) R Production/Utilities/AndroidUtilities/AndroidUtilities/src/main/res/values/strings.xml (0) R Production/Utilities/AndroidUtilities/AndroidUtilities/src/main/res/values/styles.xml (0) M Production/Utilities/AndroidUtilities/build.gradle (105) M Production/Utilities/AndroidUtilities/gradle/wrapper/gradle-wrapper.properties (1) D Production/Utilities/AndroidUtilities/lint.xml (8) A Production/Utilities/AndroidUtilities/settings.gradle (1) M Production/Utilities/JavaUtilities/build.gradle (11) M Production/Utilities/JavaUtilities/gradle/wrapper/gradle-wrapper.properties (1) M Production/Utilities/UniversalUtilities/build.gradle (4) M Production/Utilities/UniversalUtilities/gradle/wrapper/gradle-wrapper.properties (1) M Production/build.gradle (107) M Production/gradle/wrapper/gradle-wrapper.properties (1) D Production/settings.gradle (7) D build.gradle (103) D gradle/wrapper/gradle-wrapper.jar (0) Patch Links:
https://github.com/thaliproject/thali/pull/55.patch https://github.com/thaliproject/thali/pull/55.diff — Reply to this email directly or view it on GitHub.
yaronyg
Jason had an awesome idea to refactor us into gradle modules. This made dependency management easier and it also made using IntelliJ much easier since you could open all of Production in a single project window! It was a great change. Unfortunately it surfaced two bugs that we didn't find during normal testing.
The first bug had to do with the POMs being generated in Maven having the wrong ID and version. But that was trivial to fix.
The second bug is in IntelliJ and basically IntelliJ does not handle gradle subprojects in v13 correctly. They had a regression and according to http://youtrack.jetbrains.com/issue/IDEA-120939#comment=27-777233 they don't plan to fix it. I tried their work around but it didn't work. The issue is that when running in IntelliJ the resources directory for modules aren't properly added to the path and so resources aren't found during execution. Since we need those resources that was a show stopper.
IntelliJ says to go to v14 but v14 is an EAP and not even a beta yet (by their own warning language) and anyway uses a newer version of Android that isn't compatible with our version and we don't want to upgrade right now. So we had to lose a good chunk of productivity by the whole team while we pulled out the changes. Sigh.