diff --git a/metadata/eu.pretix.pretixscan.droid.yml b/metadata/eu.pretix.pretixscan.droid.yml index 4191231cee..e1aaa43512 100644 --- a/metadata/eu.pretix.pretixscan.droid.yml +++ b/metadata/eu.pretix.pretixscan.droid.yml @@ -140,17 +140,36 @@ Builds: - yes output: build/outputs/apk/pretix/release/app-pretix-release-unsigned.apk - - versionName: 1.9.2 - versionCode: 35 - disable: JARs in pretixscan/libpretixui-repo - commit: 1.9.2 + - versionName: 1.11.9 + versionCode: 56 + commit: v1.11.9 subdir: pretixscan/app submodules: true gradle: - - yes - output: build/outputs/apk/pretix/release/app-pretix-release-unsigned.apk + - pretix + srclibs: + - saki4510t-libcommon@2.12.4 + - covpass-android@v-1.38.0 + prebuild: + - sed -i -e 's|maven.pkg.github.com/Digitaler-Impfnachweis/covpass-android|jitpack.io|' + -i -e '/repositories {/a mavenLocal()' ../build.gradle + - sed -i -e "s/(project(':libuvccamera'))/('com.github.raphaelm.UVCCamera:libuvccamera:53d043fea2') + {exclude group:'com.serenegiant',module:'common'}/" -i -e "s/(project(':usbCameraCommon'))/('com.github.raphaelm.UVCCamera:usbCameraCommon:53d043fea2') + {exclude group:'com.serenegiant',module:'common'}/" -i -e '/maven {/,/^ }/d' + -i -e '/repositories {/a mavenLocal()' ../libpretixui-repo/libpretixui-android/build.gradle + scandelete: + - pretixscan/libpretixui-repo + build: + - pushd $$saki4510t-libcommon$$/common + - gradle uploadArchives + - popd + - mv $$saki4510t-libcommon$$/repository/com/serenegiant/common/2.12.4/common-2.12.4.aar + ../libpretixui-repo/common/common.aar + - pushd $$covpass-android$$ + - gradle publishToMavenLocal + - popd -AutoUpdateMode: None +AutoUpdateMode: Version UpdateCheckMode: Tags CurrentVersion: 1.11.9 CurrentVersionCode: 56 diff --git a/srclibs/Cordova.yml b/srclibs/Cordova.yml index 19fd680a77..900dc129f5 100644 --- a/srclibs/Cordova.yml +++ b/srclibs/Cordova.yml @@ -5,4 +5,3 @@ Subdir: framework Prepare: | sed -i 's/Google Inc\.:Google APIs:/android-/' project.properties - diff --git a/srclibs/Countly.yml b/srclibs/Countly.yml index 32b15bbfa0..599b67c801 100644 --- a/srclibs/Countly.yml +++ b/srclibs/Countly.yml @@ -2,5 +2,3 @@ RepoType: git Repo: https://github.com/Countly/countly-sdk-android.git Subdir: sdk - - diff --git a/srclibs/covpass-android.yml b/srclibs/covpass-android.yml new file mode 100644 index 0000000000..09fa61c99b --- /dev/null +++ b/srclibs/covpass-android.yml @@ -0,0 +1,6 @@ +RepoType: git +Repo: https://github.com/Digitaler-Impfnachweis/covpass-android.git + +Prepare: | + rm -rf app* + rm -rf common* diff --git a/srclibs/saki4510t-libcommon.yml b/srclibs/saki4510t-libcommon.yml new file mode 100644 index 0000000000..b63ac20d92 --- /dev/null +++ b/srclibs/saki4510t-libcommon.yml @@ -0,0 +1,5 @@ +RepoType: git +Repo: https://github.com/saki4510t/libcommon + +Prepare: | + rm -rf repository