Update CI configurations (tangrams#2347)

* Update CircleCI docker image for Android * Upgrade Gradle version to 7.5 and AGP to 7.4.2 * 'compileSdkVersion' -> 'compileSdk' * Specify NDK version in gradle script * Remove ndk.dir setting from Android CI config * Update vcpkg version used for Windows CI * Update github actions macos runners to macos-12 * Fix imgui formatting arguments * Use embedded imgui instead of vcpkg for Windows
sheikh-iffi · Jan 8, 2024 · b0cf95a · b0cf95a
1 parent 076b273
commit b0cf95a
Show file tree

Hide file tree

Showing 13 changed files with 306 additions and 142 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,7 +2,7 @@ version: 2.1
 executors:
   android-executor:
     docker:
-      - image: circleci/android:api-30-ndk
+      - image: cimg/android:2023.12.1-ndk
     environment:
       GRADLE_OPTS: -Xmx2048m
       CCACHE_MAXSIZE: 400M
@@ -53,8 +53,6 @@ jobs:
             - android-ccache-v4-{{ .Branch }}
             - android-ccache-v4
       - run: ccache --zero-stats
-      # Tell gradle to use pre-installed NDK. This setting is deprecated, but android.ndkPath is ignored for some reason.
-      - run: echo "ndk.dir=$ANDROID_NDK_HOME" > platforms/android/local.properties
       - run: |
           cd platforms/android && ./gradlew demo:assembleDebug \
           -Ptangram.abis=arm64-v8a \
@@ -76,8 +74,6 @@ jobs:
             - android-release-ccache-v2-{{ .Branch }}
             - android-release-ccache-v2
       - run: ccache --zero-stats
-      # Tell gradle to use pre-installed NDK. This setting is deprecated, but android.ndkPath is ignored for some reason.
-      - run: echo "ndk.dir=$ANDROID_NDK_HOME" > platforms/android/local.properties
       # Configure publishing credentials.
       - run: echo "$SIGNING_SECRET_KEYRING_BASE64" | base64 --decode > platforms/android/tangram/secring.gpg
       # Build and upload snapshot.

diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml
@@ -15,7 +15,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: microsoft/vcpkg
-          ref: 2021.05.12
+          ref: 2023.12.12
           path: vcpkg
       - name: "Setup NuGet Credentials"
         run: nuget sources add 
@@ -36,7 +36,7 @@ jobs:
         working-directory: .\build
   build-test-macos:
     name: "Build and Test on macOS"
-    runs-on: macos-10.15
+    runs-on: macos-12
     steps:
       - name: "Checkout Repository"
         uses: actions/checkout@v2
@@ -73,7 +73,7 @@ jobs:
           retention-days: 60
   build-ios:
     name: "Build for iOS"
-    runs-on: macos-10.15
+    runs-on: macos-12
     steps:
       - name: "Checkout Repository"
         uses: actions/checkout@v2

diff --git a/platforms/android/build.gradle b/platforms/android/build.gradle
@@ -5,7 +5,7 @@ allprojects {
       jcenter()
     }
     dependencies {
-      classpath 'com.android.tools.build:gradle:7.0.3'
+      classpath 'com.android.tools.build:gradle:7.4.2'
     }
   }
 

diff --git a/platforms/android/demo/build.gradle b/platforms/android/demo/build.gradle
@@ -29,6 +29,8 @@ android {
     ignoreAssetsPattern '!*.ttf'
   }
 
+  namespace 'com.mapzen.tangram.android'
+
 }
 
 dependencies {

diff --git a/platforms/android/demo/src/main/AndroidManifest.xml b/platforms/android/demo/src/main/AndroidManifest.xml
@@ -1,14 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="com.mapzen.tangram.android"
-      android:versionCode="1"
-      android:versionName="1.0">
-    <uses-feature android:glEsVersion="0x00020000" android:required="true" />
+    android:versionCode="1"
+    android:versionName="1.0">
+
+    <uses-feature
+        android:glEsVersion="0x00020000"
+        android:required="true" />
+
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <application android:label="@string/app_name" android:icon="@drawable/ic_launcher" android:theme="@style/Theme.AppCompat.NoActionBar">
-        <activity android:name="MainActivity"
-                  android:label="@string/app_name">
+
+    <application
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name"
+        android:theme="@style/Theme.AppCompat.NoActionBar">
+        <activity
+            android:name="MainActivity"
+            android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />

diff --git a/platforms/android/gradle/wrapper/gradle-wrapper.jar b/platforms/android/gradle/wrapper/gradle-wrapper.jar
diff --git a/platforms/android/gradle/wrapper/gradle-wrapper.properties b/platforms/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Wed Dec 09 00:20:45 EST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip