summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2022-03-16 11:31:02 +0100
committerArne Schwabe <arne@rfc2549.org>2022-03-16 11:31:02 +0100
commite891749956af31225e589e66d6513695355811af (patch)
tree5aac180529b3e8d33d6a15feca81905be1a0bb18
parent9fa4fa77771452a4d632089842828cc27ebd9897 (diff)
Small updates to gradle versions
-rw-r--r--build.gradle.kts2
-rw-r--r--main/build.gradle.kts8
2 files changed, 6 insertions, 4 deletions
diff --git a/build.gradle.kts b/build.gradle.kts
index 24f9b9c7..825163d0 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -15,7 +15,7 @@ buildscript {
mavenCentral()
}
dependencies {
- classpath("com.android.tools.build:gradle:7.1.1")
+ classpath("com.android.tools.build:gradle:7.1.2")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
}
}
diff --git a/main/build.gradle.kts b/main/build.gradle.kts
index 355a429e..18591e8a 100644
--- a/main/build.gradle.kts
+++ b/main/build.gradle.kts
@@ -120,9 +120,11 @@ android {
}
var swigcmd = "swig"
-// Workaround for Mac OS X since it otherwise does not find swig and I cannot get
-// the Exec task to respect the PATH environment :(
-if (File("/usr/local/bin/swig").exists())
+// Workaround for macOS(arm64) and macOS(intel) since it otherwise does not find swig and
+// I cannot get the Exec task to respect the PATH environment :(
+if (file("/opt/homebrew/bin/swig").exists())
+ swigcmd = "/opt/homebrew/bin/swig"
+else if (file("/usr/local/bin/swig").exists())
swigcmd = "/usr/local/bin/swig"