simple-c2pa

commit 67ad2f578461b947d9be578787a85b3177bef450
parent fa0337b67e2c23bc09a6386bd4e722380d383d12
Author: Darren Clarke <darren@redaranj.com>
Date:   Wed,  6 Dec 2023 14:28:20 +0000

Merge branch 'develop' into 'main'

Mobile CI updates

See merge request guardianproject/proofmode/simple-c2pa!3
Diffstat:
M
android/.gitlab-ci.yml
 | 
12
+-----------
A
android/project/gradle/wrapper/gradle-wrapper.jar
 | 
0

M
android/project/simple_c2pa/build.gradle.kts
 | 
9
++++-----
M
apple/.gitlab-ci.yml
 | 
23
++++++++++++++++++-----

4 files changed, 23 insertions(+), 21 deletions(-)
diff --git a/android/.gitlab-ci.yml b/android/.gitlab-ci.yml
@@ -17,22 +17,12 @@ build_android:
     paths:
       - ./out/android/
 
-upload_android:
-  only:
-    - tags
-  stage: upload
-  image: curlimages/curl:latest
-  script:
-    - 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file ./out/android/kotlin.zip "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/simple_c2pa/android-v0.${CI_PIPELINE_IID}/kotlin.zip"'
-    - 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file ./out/android/jniLibs.zip "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/simple_c2pa/android-v0.${CI_PIPELINE_IID}/jniLibs.zip"'
-
 publish_android:
   image: mobiledevops/android-sdk-image:33.0.2
   only:
-    - develop
     - tags
   stage: release
   script:
     - cp -r out/android/* android/project/simple_c2pa/src/main/
     - ls -al android/project/simple_c2pa/src/main/
-    - cd android/project && ./gradlew clean assembleRelease
+    - cd android/project && ./gradlew clean assembleRelease && ./gradlew publish
diff --git a/android/project/gradle/wrapper/gradle-wrapper.jar b/android/project/gradle/wrapper/gradle-wrapper.jar
Binary files differ.
diff --git a/android/project/simple_c2pa/build.gradle.kts b/android/project/simple_c2pa/build.gradle.kts
@@ -36,7 +36,6 @@ android {
 }
 
 dependencies {
-
     implementation("androidx.core:core-ktx:1.9.0")
     implementation("androidx.appcompat:appcompat:1.6.1")
     implementation("com.google.android.material:material:1.8.0")
@@ -52,15 +51,15 @@ publishing {
       artifact("$buildDir/outputs/aar/${project.name}-release.aar")
       groupId = "info.guardianproject"
       artifactId = "simple_c2pa"
-      version = "0.0.5"
+      version = System.getenv("CI_COMMIT_TAG") as String? 
     }
   }
   repositories {
     maven {
-      url = uri("https://gitlab.com/api/v4/projects/52243488/packages/maven")
+      url = uri("https://gitlab.com/api/v4/projects/51891540/packages/maven")
       credentials {
-        this.username =  findProperty("MAVEN_USERNAME") as String?
-        this.password =  findProperty("MAVEN_PASSWORD") as String?
+        this.username =  System.getenv("MAVEN_USERNAME") as String?
+        this.password =  System.getenv("MAVEN_PASSWORD") as String?
       }
     }
   }
diff --git a/apple/.gitlab-ci.yml b/apple/.gitlab-ci.yml
@@ -4,6 +4,10 @@ stages:
   - release
 
 build_apple:
+  only:
+    - main
+    - develop
+    - tags
   tags:
     - proofmode-macos
   stage: build
@@ -14,19 +18,24 @@ build_apple:
       - ./out/apple/
 
 upload_apple:
+  only:
+    - tags
   stage: upload
   image: curlimages/curl:latest
   script:
-    - 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file ./out/apple/SimpleC2PA.swift "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/simple_c2pa/apple-v0.${CI_PIPELINE_IID}/SimpleC2PA.swift"'
-    - 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file ./out/apple/SimpleC2PA.xcframework.zip "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/simple_c2pa/apple-v0.${CI_PIPELINE_IID}/SimpleC2PA.xcframework.zip"'
+    - 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file ./out/apple/SimpleC2PA.swift "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/simple_c2pa/{CI_COMMIT_TAG}/SimpleC2PA.swift"'
+    - 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file ./out/apple/SimpleC2PA.xcframework.zip "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/simple_c2pa/${CI_COMMIT_TAG}/SimpleC2PA.xcframework.zip"'
 
 publish_apple:
+  only:
+    - tags    
   stage: release
   image: debian:bullseye
   before_script:
     - apt-get update && apt-get install -y git perl
     - git config --global user.email "${GITLAB_USER_EMAIL}"
     - git config --global user.name "${GITLAB_USER_NAME}"
+    - set-url --push origin "https://${GITLAB_ACCESS_USERNAME:$GITLAB_ACCESS_TOKEN@gitlab.com/guardianproject/proofmode/simple-c2pa.git"
   script:
     - cp out/apple/SimpleC2PA.swift apple/src/SimpleC2PA/
     - FRAMEWORK_URL="${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/simple_c2pa/apple-v0.${CI_PIPELINE_IID}/SimpleC2PA.xcframework.zip"
@@ -35,10 +44,14 @@ publish_apple:
     - echo "Updating Package.swift..."
     - echo $FRAMEWORK_URL
     - echo $CHECKSUM
-    - 'sed -i "s|url: \\".*\\"|url: \\"${FRAMEWORK_URL}\\"|g" Package.swift'
-    - 'sed -i "s|checksum: \\".*\\"|checksum: \\"${CHECKSUM}\\"|g" Package.swift'
+    - 'sed -i "s|url: \".*\"|url: \"${FRAMEWORK_URL}\"|g" Package.swift'
+    - 'sed -i "s|checksum: \".*\"|checksum: \"${CHECKSUM}\"|g" Package.swift'
     - cat Package.swift
     - git add Package.swift
     - git add apple/src/SimpleC2PA/SimpleC2PA.swift
     - git commit -m "Update Swift files"
-    - git push origin HEAD:$CI_COMMIT_REF_NAME
+    - git push origin HEAD:$CI_COMMIT_REF_NAME    
+    - git push --delete origin $CI_COMMIT_TAG
+    - git tag -d $CI_COMMIT_TAG
+    - git tag $CI_COMMIT_TAG
+    - git push origin $CI_COMMIT_TAG