Skip to content

Commit

Permalink
Build without ant+ for F-Droid (#1133)
Browse files Browse the repository at this point in the history
Update appcompat version
  • Loading branch information
gerhardol authored Feb 15, 2023
1 parent f898c3d commit ed393a2
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
10 changes: 5 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ project.ext {
compileSdkVersion = 33 //Update Travis manually
targetSdkVersion = 33

appcompat_version = "1.6.0"
appcompat_version = "1.6.1"
annotation_version = "1.5.0"
//Note: Later Play Services will require a rewrite of NodeApi.NodeListener
googlePlayServicesVersion = '11.0.4'
Expand All @@ -30,8 +30,8 @@ project.ext {
mockitoVersion = '3.11.2'

//The Git tag for the release must be identical for F-Droid
versionName = '2.5.0.3'
versionCode = 321
versionName = '2.5.0.4'
versionCode = 322
latestBaseVersionCode = 15000000

// F-Droid builds only allow free software (wear dir deleted at builds)
Expand All @@ -43,7 +43,7 @@ project.ext {
antPlusLibPath = "$rootDir/ANT-Android-SDKs/ANT+_Android_SDK/API"
antPlusLibName = "antpluginlib_3-8-0"
if (!allowNonFree || project.hasProperty('org.runnerup.hr.disableAntPlus') || !rootProject.file(antPlusLibPath+'/'+antPlusLibName+'.aar').exists()) {
antPlusLib = ""
antPlusLibName = ""
}

// ApplicationId (possibly with a .debug suffix) shared Android and Wear
Expand All @@ -61,7 +61,7 @@ project.ext {
// AGPBI: {"kind":"warning","text":"Using flatDir should be avoided because it doesn't support any meta-data formats.","sources":[{}]}
allprojects {
repositories {
if (rootProject.ext.antPlusLibPath) {
if (rootProject.ext.antPlusLibName) {
flatDir { dirs rootProject.ext.antPlusLibPath }
}
}
Expand Down
4 changes: 2 additions & 2 deletions hrdevice/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ android {
minSdkVersion 15
targetSdkVersion rootProject.ext.targetSdkVersion

if (rootProject.ext.antPlusLibPath) {
if (rootProject.ext.antPlusLibName) {
buildConfigField 'Boolean', 'ANTPLUS_ENABLED', "true"
} else {
android.sourceSets.main.java.excludes = ['org/runnerup/hr/AntPlus.java']
Expand All @@ -44,7 +44,7 @@ repositories {
dependencies {
implementation "androidx.appcompat:appcompat:${rootProject.ext.appcompat_version}"

if (rootProject.ext.antPlusLibPath) {
if (rootProject.ext.antPlusLibName) {
implementation(name: rootProject.ext.antPlusLibName, ext: 'aar')
}
}

0 comments on commit ed393a2

Please sign in to comment.