Skip to content

Commit edbe72e

Browse files
authored
Merge pull request #1730 from keymapperorg/feature/1711-modules
#1711 multi module
2 parents 2e4e03c + c3258fc commit edbe72e

File tree

989 files changed

+12219
-14845
lines changed

Some content is hidden

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

989 files changed

+12219
-14845
lines changed

.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ ktlint_function_naming_ignore_when_annotated_with = Composable
44
ktlint_ignore_back_ticked_identifier = true
55
ktlint_code_style = intellij_idea # Use IntelliJ style because it has trailing commas
66

7-
[app/src/main/java/io/github/sds100/keymapper/util/ui/compose/icons/*.{kt,kts}]
7+
[base/src/main/java/io/github/sds100/keymapper/base/utils/ui/compose/icons/*.{kt,kts}]
88
ktlint_standard_property-naming = disabled
99
ktlint_standard_backing-property-naming = disabled

.github/workflows/pull-request.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
uses: android-actions/setup-android@v2
2222

2323
- name: Unit tests
24-
run: bash ./gradlew testFreeDebugUnitTest
24+
run: bash ./gradlew testDebugUnitTest
2525

2626
style:
2727
name: Code style check
@@ -96,10 +96,10 @@ jobs:
9696
run: bundle exec fastlane testing
9797

9898
- name: set apk name env
99-
run: echo "APK_NAME=$(basename app/build/outputs/apk/free/ci/*.apk .apk)" >> $GITHUB_ENV
99+
run: echo "APK_NAME=$(basename app/build/outputs/apk/ci/*.apk .apk)" >> $GITHUB_ENV
100100

101101
- name: Upload APK
102102
uses: actions/upload-artifact@v4
103103
with:
104104
name: ${{ env.APK_NAME }}
105-
path: app/build/outputs/apk/free/ci/${{ env.APK_NAME }}.apk
105+
path: app/build/outputs/apk/ci/${{ env.APK_NAME }}.apk

.github/workflows/testing.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
uses: android-actions/setup-android@v2
2828

2929
- name: Unit tests
30-
run: bash ./gradlew testFreeDebugUnitTest
30+
run: bash ./gradlew testDebugUnitTest
3131

3232
style:
3333
name: Code style check

.idea/.name

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/material_theme_project_new.xml

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/navEditor.xml

Lines changed: 257 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## [3.1.2](https://github.com/sds100/KeyMapper/releases/tag/v3.1.2)
1+
## [3.2.0](https://github.com/sds100/KeyMapper/releases/tag/v3.2.0)
22

33
#### TO BE RELEASED
44

@@ -15,6 +15,7 @@
1515
- #1686 (more fixes) do not show some screens behind system bars on the left/right side of the device.
1616
- #1701 optimize the trigger screen for smaller screens so elements are less cut off.
1717
- #1699 Do not highlight a floating button as if it is pressed after triggering a key event action from it.
18+
- Button to copy the key map UID to the clipboard is invisible on small screens.
1819

1920
## [3.1.1](https://github.com/sds100/KeyMapper/releases/tag/v3.1.1)
2021

api/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/build

api/build.gradle.kts

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
plugins {
2+
alias(libs.plugins.android.library)
3+
alias(libs.plugins.kotlin.android)
4+
alias(libs.plugins.google.devtools.ksp)
5+
alias(libs.plugins.jlleitschuh.gradle.ktlint)
6+
alias(libs.plugins.dagger.hilt.android)
7+
}
8+
9+
android {
10+
namespace = "io.github.sds100.keymapper.api"
11+
compileSdk = libs.versions.compile.sdk.get().toInt()
12+
13+
defaultConfig {
14+
minSdk = libs.versions.min.sdk.get().toInt()
15+
16+
consumerProguardFiles("consumer-rules.pro")
17+
}
18+
19+
buildTypes {
20+
release {
21+
isMinifyEnabled = true
22+
proguardFiles(
23+
getDefaultProguardFile("proguard-android-optimize.txt"),
24+
"proguard-rules.pro",
25+
)
26+
}
27+
}
28+
compileOptions {
29+
sourceCompatibility = JavaVersion.VERSION_11
30+
targetCompatibility = JavaVersion.VERSION_11
31+
}
32+
kotlinOptions {
33+
jvmTarget = "11"
34+
}
35+
36+
buildFeatures {
37+
aidl = true
38+
}
39+
}
40+
41+
dependencies {
42+
implementation(project(":common"))
43+
implementation(project(":base"))
44+
implementation(project(":system"))
45+
46+
implementation(libs.jakewharton.timber)
47+
48+
implementation(libs.dagger.hilt.android)
49+
ksp(libs.dagger.hilt.android.compiler)
50+
}

app/src/test/resources/backup-manager-test/empty.json renamed to api/consumer-rules.pro

File renamed without changes.

0 commit comments

Comments
 (0)