Skip to content

Commit 8ef453f

Browse files
authored
Merge pull request #466 from opendocument-app/kill-artifactory
Get rid of Artifactory dependency
2 parents 5725c01 + d4f0c46 commit 8ef453f

5 files changed

Lines changed: 18 additions & 13 deletions

File tree

.github/workflows/build_test.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,18 @@ jobs:
3737
- name: install ndk
3838
run: yes | ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --install "ndk;${{ env.ndk_version }}"
3939

40-
- name: conan remote
41-
run: |
42-
conan remote remove "*"
43-
conan remote add odr https://artifactory.opendocument.app/artifactory/api/conan/conan
44-
conan remote add conancenter https://center2.conan.io
4540
- name: conan profile
4641
run: conan profile detect
4742

43+
- name: checkout core
44+
run: git submodule update --init --depth 1 OpenDocument.core
45+
46+
- name: checkout conan-index
47+
run: cd OpenDocument.core; git submodule update --init --depth 1 conan-odr-index
48+
49+
- name: export conan-odr-index
50+
run: python OpenDocument.core/conan-odr-index/scripts/conan_export_all_packages.py
51+
4852
- name: Gradle cache
4953
uses: gradle/actions/setup-gradle@v3
5054

@@ -53,10 +57,6 @@ jobs:
5357

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

6161
- name: Artifact APKs
6262
uses: actions/upload-artifact@v4

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "OpenDocument.core"]
2+
path = OpenDocument.core
3+
url = https://github.com/opendocument-app/OpenDocument.core

OpenDocument.core

Submodule OpenDocument.core added at 7862afa

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ Please help to translate on the https://crowdin.com/project/opendocument
1818

1919
- install conan using pip in a venv
2020
- `conan profile detect --force`
21-
- `conan remote add odr https://artifactory.opendocument.app/artifactory/api/conan/conan`
22-
- move odr-repository to first index in .conan2/remotes.json
2321
- make sure `conan` is in your $PATH or replace conan-call in `app/build.gradle`
22+
- `git submodule update --init --depth 1 OpenDocument.core`
23+
- `cd OpenDocument.core; git submodule update --init --depth 1 conan-odr-index`
24+
- `python OpenDocument.core/conan-odr-index/scripts/conan_export_all_packages.py`

app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:tools="http://schemas.android.com/tools"
44
android:installLocation="auto"
5-
android:versionCode="199"
6-
android:versionName="4.3"
5+
android:versionCode="202"
6+
android:versionName="4.6"
77
tools:ignore="GoogleAppIndexingWarning">
88

99
<uses-permission android:name="android.permission.INTERNET" />

0 commit comments

Comments
 (0)