Skip to content

Get rid of Artifactory dependency #466

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.

Sign up for GitHub

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

Draft
TomTasche wants to merge 7 commits into
base: main
Choose a base branch
from
Draft

Get rid of Artifactory dependency #466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0950399
raise version
TomTasche Mar 31, 2026
f24c0f3
Merge branch 'main' of github.com:opendocument-app/OpenDocument.droid
TomTasche Mar 31, 2026
aa228bd
get rid of artifactory dependency
TomTasche Mar 31, 2026
412af33
update README
TomTasche Mar 31, 2026
4a59f21
update CI
TomTasche Mar 31, 2026
336d04d
raise version
TomTasche Mar 31, 2026
444b8aa
fix CI
TomTasche Mar 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .github/workflows/build_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,18 @@ jobs:
- name: install ndk
run: yes | ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --install "ndk;${{ env.ndk_version }}"

- name: conan remote
run: |
conan remote remove "*"
conan remote add odr https://artifactory.opendocument.app/artifactory/api/conan/conan
conan remote add conancenter https://center2.conan.io
- name: conan profile
run: conan profile detect

- name: checkout core
run: git submodule update --init --depth 1 OpenDocument.core

- name: checkout conan-index
run: cd OpenDocument.core; git submodule update --init --depth 1 conan-odr-index

- name: export conan-odr-index
run: python OpenDocument.core/conan-odr-index/scripts/conan_export_all_packages.py

- name: Gradle cache
uses: gradle/actions/setup-gradle@v3

Expand All @@ -53,10 +57,6 @@ jobs:

- name: conan cache size
run: du -h -d1 ~/.conan2/p
- name: conan login
run: conan remote login odr admin --password '${{ secrets.ARTIFACTORY }}'
- name: conan upload
run: conan upload "*" --check --confirm --remote odr

- name: Artifact APKs
uses: actions/upload-artifact@v4
Expand Down
77 changes: 0 additions & 77 deletions .github/workflows/claude-code-review.yml
View file
Open in desktop

This file was deleted.

64 changes: 0 additions & 64 deletions .github/workflows/claude.yml
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "OpenDocument.core"]
path = OpenDocument.core
url = https://github.com/opendocument-app/OpenDocument.core
Comment on lines +1 to +3
Copy link
Copy Markdown
Member

@andiwand andiwand Mar 31, 2026

Choose a reason for hiding this comment

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

I think this should rather depend on https://github.com/opendocument-app/conan-odr-index so versions make sense. updates can be automated with renovate

Copy link
Copy Markdown
Member Author

@TomTasche TomTasche Mar 31, 2026

Choose a reason for hiding this comment

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

makes sense, but by the time you mentioned this idea earlier today I had it all implemented already. also, I hope I can leverage that core submodule in other ways in the future, i.e. reusing latest test documents in an automated fashion... or maybe I'm dreaming!

Copy link
Copy Markdown
Member

@andiwand andiwand Mar 31, 2026

Choose a reason for hiding this comment

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

right but that can also be achieved by getting the test repo as submoulde

depending directly on the core means that the directory structure couples which adds another thing that can break

we would still need to bump the submodule to core to make an update but lose the version number. does not really seem worth to me. but your call on the platform side

1 change: 1 addition & 0 deletions OpenDocument.core
Open in desktop
Submodule OpenDocument.core added at eb4ad4
5 changes: 3 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ Please help to translate on the https://crowdin.com/project/opendocument

- install conan using pip in a venv
- `conan profile detect --force`
- `conan remote add odr https://artifactory.opendocument.app/artifactory/api/conan/conan`
- move odr-repository to first index in .conan2/remotes.json
- make sure `conan` is in your $PATH or replace conan-call in `app/build.gradle`
- `git submodule update --init --depth 1 OpenDocument.core`
- `cd OpenDocument.core; git submodule update --init --depth 1 conan-odr-index`
- `python OpenDocument.core/conan-odr-index/scripts/conan_export_all_packages.py`
4 changes: 2 additions & 2 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:installLocation="auto"
android:versionCode="199"
android:versionName="4.3"
android:versionCode="201"
android:versionName="4.5"
tools:ignore="GoogleAppIndexingWarning">

<uses-permission android:name="android.permission.INTERNET" />
Expand Down
Loading