Skip to content

android: fix javadoc#16361

Merged
opencv-pushbot merged 1 commit intoopencv:masterfrom
alalek:android_fix_javadoc
Jan 15, 2020
Merged

android: fix javadoc#16361
opencv-pushbot merged 1 commit intoopencv:masterfrom
alalek:android_fix_javadoc

Conversation

@alalek
Copy link
Copy Markdown
Member

@alalek alalek commented Jan 15, 2020

partially reverts #16222

Javadoc doesn't know about Gradle and its scripts.
Should fix nightly builds: http://pullrequest.opencv.org/buildbot/builders/master_pack-android

@alalek
Copy link
Copy Markdown
Member Author

alalek commented Jan 15, 2020

👍

/cc @hannesa2

@opencv-pushbot opencv-pushbot merged commit a90dacd into opencv:master Jan 15, 2020
* Current OpenCV Library version
*/
public static final String OPENCV_VERSION = BuildConfig.VERSION_NAME;
public static final String OPENCV_VERSION = "@OPENCV_VERSION_MAJOR@.@OPENCV_VERSION_MINOR@.@OPENCV_VERSION_PATCH@";
Copy link
Copy Markdown
Contributor

@hannesa2 hannesa2 Jan 15, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With you suggestion #16222 (comment) we do now https://github.com/hannesa2/owncloud-android/blob/70b27be1ade7f30b0e1e8e699ec6a61b09949aaf/owncloudApp/build.gradle#L263-L266 a calculation

def openCVersionCode = ((@OPENCV_VERSION_MAJOR@ * 100 + @OPENCV_VERSION_MINOR@) * 100 + @OPENCV_VERSION_PATCH@) * 10 + 0

which we don't do here. So it differs !

That's why I tried to go into the direction of a single point of truth, instead to set this value on various places.

In an ideal world you would take the git tag name like https://github.com/hannesa2/owncloud-android/blob/70b27be1ade7f30b0e1e8e699ec6a61b09949aaf/owncloudApp/build.gradle#L263-L266

The main problem is javadoc and not the usage of state of the art BuildConfig

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure that I understand you correctly.
OPENCV_VERSION ("4.2.0") != package version code (40020000)

Yes, Javadoc generation can be migrated on Gradle (for Android only? because we still have normal "desktop" Java with "Ant"): https://docs.gradle.org/current/dsl/org.gradle.api.tasks.javadoc.Javadoc.html
(unfortunatelly we don't have extra time for this task right now)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants