Skip to content

Commit aef8a2d

Browse files
authored
Merge pull request #15 from smartbank-inc/use-opencv-aar-package
Use official OpenCV AAR package / Update libraries
2 parents 3e9b639 + 3ea1ae3 commit aef8a2d

File tree

900 files changed

+52
-767704
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

900 files changed

+52
-767704
lines changed

.github/workflows/create-release-pr.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ jobs:
44
job:
55
runs-on: ubuntu-18.04
66
steps:
7-
- uses: actions/checkout@v2.3.4
7+
- name: Checkout Code
8+
uses: actions/checkout@v5.0.0
89
with:
910
fetch-depth: 0
1011
- name: Set up Ruby

.github/workflows/test.yml

Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,34 +5,48 @@ jobs:
55
runs-on: ubuntu-latest
66
steps:
77
- name: Checkout Code
8-
uses: actions/checkout@v2
8+
uses: actions/checkout@v5.0.0
99
with:
1010
fetch-depth: 0
11+
- name: Setup Java 17
12+
uses: actions/setup-java@v4
13+
with:
14+
distribution: 'temurin'
15+
java-version: 17
1116
- name: Run Unit Test
12-
run: ./gradlew test
17+
run: ./gradlew library:test
1318
- name: Upload Artifacts
14-
uses: actions/upload-artifact@v2
19+
uses: actions/upload-artifact@v4
1520
with:
1621
name: unit_test_reports
1722
path: library/build/reports/tests/testDebugUnitTest/
23+
retention-days: 60
1824
instrumentation-test:
19-
runs-on: macos-latest
25+
runs-on: ubuntu-latest
2026
steps:
2127
- name: Checkout Code
22-
uses: actions/checkout@v2
28+
uses: actions/checkout@v5.0.0
2329
with:
2430
fetch-depth: 0
25-
- name: Setup Java 11
26-
uses: actions/setup-java@v1
31+
- name: Setup Java 17
32+
uses: actions/setup-java@v4
2733
with:
28-
java-version: 11
34+
distribution: 'temurin'
35+
java-version: 17
36+
- name: Enable KVM
37+
run: |
38+
echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
39+
sudo udevadm control --reload-rules
40+
sudo udevadm trigger --name-match=kvm
2941
- name: Run Instrumentation Test
30-
uses: reactivecircus/android-emulator-runner@v2
42+
uses: reactivecircus/android-emulator-runner@1dcd0090116d15e7c562f8db72807de5e036a4ed # v2.34.0
3143
with:
44+
arch: 'x86_64'
3245
api-level: 29
33-
script: ./gradlew connectedCheck
46+
script: ./gradlew library:connectedCheck
3447
- name: Upload Artifacts
35-
uses: actions/upload-artifact@v2
48+
uses: actions/upload-artifact@v4
3649
with:
3750
name: instrumentation_test_reports
3851
path: library/build/reports/androidTests/connected/
52+
retention-days: 60

build.gradle

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,11 @@ buildscript {
1313
mavenCentral()
1414
}
1515
dependencies {
16-
classpath 'com.android.tools.build:gradle:7.0.3'
17-
classpath 'com.github.kezong:fat-aar:1.3.6'
18-
classpath 'org.jetbrains.dokka:dokka-gradle-plugin:1.5.30'
19-
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31'
16+
classpath 'com.android.tools.build:gradle:8.13.0'
17+
classpath 'org.jetbrains.kotlin.plugin.compose:org.jetbrains.kotlin.plugin.compose.gradle.plugin:2.2.21'
18+
classpath 'org.jetbrains.dokka:dokka-gradle-plugin:2.1.0'
19+
classpath 'org.jetbrains.dokka:dokka-gradle-plugin:2.1.0'
20+
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.20'
2021
}
2122
}
2223

0 commit comments

Comments
 (0)