Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
- name: Setup JDK
uses: actions/setup-java@v1.4.4
with:
java-version: 11
java-version: 17
- name: Checkout source
uses: actions/checkout@v4
- name: Cache build deps
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pull.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
- name: Setup JDK
uses: actions/setup-java@v1.4.4
with:
java-version: 11
java-version: 17
- name: Checkout source
uses: actions/checkout@v4
- name: Cache build deps
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- name: Setup JDK
uses: actions/setup-java@v1.4.4
with:
java-version: 11
java-version: 17
- name: Checkout source
uses: actions/checkout@v4
- name: Cache build deps
Expand Down Expand Up @@ -71,7 +71,7 @@ jobs:
- name: Setup JDK
uses: actions/setup-java@v1.4.4
with:
java-version: 11
java-version: 17
- name: Cache build deps
uses: actions/cache@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ publishing {
android {
namespace = project.group.toString()
compileSdk = 33
sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
namespace = "io.rebble.libpebblecommon"
defaultConfig {
minSdk = 21
targetSdk = compileSdk
Expand Down
3 changes: 1 addition & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,4 @@ org.gradle.jvmargs=-Xms128M -Xmx1G -XX:ReservedCodeCacheSize=200M
kotlin.native.binary.memoryModel=experimental
kotlin.mpp.androidSourceSetLayoutVersion=2
kotlinVersion=2.0.0
agpVersion=7.4.0
android.disableAutomaticComponentCreation=true
agpVersion=8.1.4
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
5 changes: 3 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#Sun Apr 23 00:52:13 BST 2023
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
41 changes: 28 additions & 13 deletions gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 9 additions & 6 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion src/androidMain/AndroidManifest.xml

This file was deleted.