Merge branch 'main' into dev

.github/workflows/release.yml

@@ -5,9 +5,11 @@ on:
   push:
     branches: 
       - main
+      - dev
   pull_request:
     branches:
       - main
+      - dev
 
 jobs:
   build:
@@ -17,31 +19,22 @@ jobs:
       uses: styfle/[email protected]
       with:
         access_token: ${{ secrets.GITHUB_TOKEN }}
-
     - name: Checkout Repo
       uses: actions/checkout@v3
-
     - name: Set up JDK 11
       uses: actions/setup-java@v3
       with:
         java-version: '11'
         distribution: 'zulu'
-
+    - name: Setup Node.js
+      uses: actions/setup-node@v2
+      with:
+        node-version: "lts/*"
     - name: Build with Gradle
       run: ./gradlew --no-daemon build
-
-    - name: Github Tag Bump
-      uses: anothrNick/[email protected]
+    - name: Setup semantic-release
+      run: npm install -g semantic-release @semantic-release/git @semantic-release/changelog gradle-semantic-release-plugin -D
+    - name: Release
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        WITH_V: true
-      id: bump_version
-
-    - name: Upload APKs to Release
-      uses: svenstaro/upload-release-action@v2
-      with:
-        repo_token: ${{ secrets.GITHUB_TOKEN }}
-        file: ./app/build/outputs/apk/release/*.apk
-        tag: ${{ steps.bump_version.outputs.new_tag }}
-        token: ${{ secrets.GITHUB_TOKEN }}
-        file_glob: true
+      run: npx semantic-release

.releaserc

@@ -0,0 +1,34 @@
+{
+  "branches": [
+    "main",
+    {
+      "name": "dev",
+      "prerelease": true
+    }
+  ],
+  "plugins": [
+    "@semantic-release/commit-analyzer",
+    "@semantic-release/release-notes-generator",
+    "@semantic-release/changelog",
+    "gradle-semantic-release-plugin",
+    [
+      "@semantic-release/git",
+      {
+        "assets": [
+          "CHANGELOG.md",
+          "gradle.properties"
+        ]
+      }
+    ],
+    [
+      "@semantic-release/github",
+      {
+        "assets": [
+          {
+            "path": "app/build/outputs/apk/release/*.apk"
+          }
+        ]
+      }
+    ]
+  ]
+}

app/build.gradle

@@ -27,13 +27,13 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
 }
 
 dependencies {
-    compileOnly 'androidx.annotation:annotation:1.3.0'
+    compileOnly 'androidx.annotation:annotation:1.4.0'
     compileOnly 'androidx.constraintlayout:constraintlayout:2.1.4'
 }
 

build.gradle

@@ -20,6 +20,12 @@ allprojects {
     }
 }
 
+// Tracking issue https://github.com/semantic-release/semantic-release/issues/963
+task publish(type: DefaultTask) {
+    group = 'publish'
+    description = 'Dummy publish to pass the verification phase of the gradle-semantic-release-plugin'
+}
+
 task clean(type: Delete) {
     delete rootProject.buildDir
 }

gradle.properties

@@ -16,4 +16,5 @@ org.gradle.jvmargs=-Xmx2048m
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
+android.enableJetifier=true
+version = 0.19.0