Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update CI configurations #2347

Merged
merged 9 commits into from
Jan 8, 2024
Merged

Update CI configurations #2347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
bc29e4d
Update CircleCI docker image for Android
matteblair Jan 6, 2024
7a4362a
Upgrade Gradle version to 7.5 and AGP to 7.4.2
matteblair Jan 6, 2024
1033f8c
'compileSdkVersion' -> 'compileSdk'
matteblair Jan 8, 2024
c572017
Specify NDK version in gradle script
matteblair Jan 8, 2024
6d34ae2
Remove ndk.dir setting from Android CI config
matteblair Jan 8, 2024
c6c104e
Update vcpkg version used for Windows CI
matteblair Jan 8, 2024
0763a6a
Update github actions macos runners to macos-12
matteblair Jan 8, 2024
352efeb
Fix imgui formatting arguments
matteblair Jan 8, 2024
d43ccf1
Use embedded imgui instead of vcpkg for Windows
matteblair Jan 8, 2024
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
6 changes: 1 addition & 5 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 \
Expand All @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pr-checks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion platforms/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
}

Expand Down
2 changes: 2 additions & 0 deletions platforms/android/demo/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ android {
ignoreAssetsPattern '!*.ttf'
}

namespace 'com.mapzen.tangram.android'

}

dependencies {
Expand Down
22 changes: 15 additions & 7 deletions platforms/android/demo/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" />
Expand Down
Binary file modified platforms/android/gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
3 changes: 1 addition & 2 deletions platforms/android/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Loading
Loading