Support for Xcode 15

Lianghuajian · Jul 21, 2024 · 771945c · 771945c
1 parent 6031946
commit 771945c
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 16 deletions.
diff --git a/.github/workflows/system-llvm.yaml b/.github/workflows/system-llvm.yaml
@@ -2,7 +2,7 @@ name: Build Using System LLVM
 on:
   pull_request:
   schedule:
-    - cron:  '0 15 * * 0'
+    - cron:  '0 16 * * 0'
 
 jobs:
   build-on-linux:
@@ -16,21 +16,21 @@ jobs:
       - run: |
           wget https://apt.llvm.org/llvm.sh
           chmod +x llvm.sh
-          sudo ./llvm.sh 14
-          sudo apt-get -y install libllvm14 llvm-14 llvm-14-dev llvm-14-runtime clang-14 clang-tools-14 libclang-common-14-dev libclang-14-dev libclang1-14 libomp-14-dev libmlir-14-dev
+          sudo ./llvm.sh 16
+          sudo apt-get -y install libllvm16 llvm-16 llvm-16-dev llvm-16-runtime clang-16 clang-tools-16 libclang-common-16-dev libclang-16-dev libclang1-16 libomp-16-dev libmlir-16-dev
       - run: |
           cd oclint-scripts
-          ./build -no-ninja -llvm-root=/usr/lib/llvm-14
-          ./bundle -archive -llvm-root=/usr/lib/llvm-14
+          ./build -no-ninja -llvm-root=/usr/lib/llvm-16
+          ./bundle -archive -llvm-root=/usr/lib/llvm-16
   build-on-mac:
     runs-on: macos-11
     steps:
       - uses: actions/checkout@v2
       - run: |
           sudo xcode-select -s /Applications/Xcode.app/Contents/Developer
           brew update
-          brew install llvm@14
+          brew install llvm@16
       - run: |
           cd oclint-scripts
-          ./build -no-ninja -llvm-root=/usr/local/opt/llvm\@14
-          ./bundle -archive -llvm-root=/usr/local/opt/llvm\@14
+          ./build -no-ninja -llvm-root=/usr/local/opt/llvm\@16
+          ./bundle -archive -llvm-root=/usr/local/opt/llvm\@16
diff --git a/oclint-core/cmake/OCLintConfig.cmake b/oclint-core/cmake/OCLintConfig.cmake
@@ -24,7 +24,7 @@ ENDIF()
 
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
 
-SET(OCLINT_VERSION_RELEASE "23.0")
+SET(OCLINT_VERSION_RELEASE "24.0")
 
 IF(LLVM_ROOT)
     IF(NOT EXISTS ${LLVM_ROOT}/include/llvm)

diff --git a/oclint-core/lib/Constants.cpp b/oclint-core/lib/Constants.cpp
@@ -4,7 +4,7 @@ using namespace oclint;
 
 std::string Constants::version()
 {
-    return "23.0";
+    return "24.0";
 }
 
 std::string Constants::homepage()

diff --git a/oclint-core/test/VersionTest.cpp b/oclint-core/test/VersionTest.cpp
@@ -8,7 +8,7 @@ using namespace oclint;
 
 TEST(VersionTest, VersionString)
 {
-    EXPECT_THAT(Constants::version(), StrEq("23.0"));
+    EXPECT_THAT(Constants::version(), StrEq("24.0"));
 }
 
 TEST(VersionTest, HomepageString)

diff --git a/oclint-scripts/oclintscripts/path.py b/oclint-scripts/oclintscripts/path.py
@@ -69,10 +69,10 @@ class url:
     json_compilation_database = 'https://github.com/oclint/oclint-json-compilation-database.git'
     xcodebuild = 'https://github.com/oclint/oclint-xcodebuild.git'
 
-    clang_prebuilt_binary_for_macos_arm64 = 'https://github.com/Lianghuajian/llvm-builder/releases/download/llvm-14.0.0/llvm-14.0.0-arm64-apple-darwin.tar.xz'
+    clang_prebuilt_binary_for_macos_arm64 = 'https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0/clang+llvm-16.0.0-arm64-apple-darwin22.0.tar.xz'
     clang_prebuilt_binary_for_ubuntu_lts_20 = 'https://github.com/ryuichis/llvm-builder/releases/download/llvm-13.0.1/llvm-13.0.1-x86_64-linux-gnu-ubuntu-20.04.tar.xz'
-    clang_prebuilt_binary_for_macos = 'https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.0/clang+llvm-14.0.0-x86_64-apple-darwin.tar.xz'
-    clang_prebuilt_binary_for_ubuntu_lts_20_aarch64 = 'https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.0/clang+llvm-14.0.0-aarch64-linux-gnu.tar.xz'
+    clang_prebuilt_binary_for_macos = 'https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.0/clang+llvm-15.0.0-x86_64-apple-darwin.tar.xz'
+    clang_prebuilt_binary_for_ubuntu_lts_20_aarch64 = 'https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.0/clang+llvm-15.0.0-x86_64-linux-gnu-rhel-8.4.tar.xz'
 
 def cd(dir_path):
     os.chdir(dir_path)

diff --git a/oclint-scripts/oclintscripts/version.py b/oclint-scripts/oclintscripts/version.py
@@ -18,10 +18,10 @@ def dev_version():
         return "src"
 
 def oclint_version():
-    return "23.0"
+    return "24.0"
 
 def oclint_dev_version():
     return oclint_version() + '.dev.' + dev_version()
 
 def llvm_version():
-    return "14.0.0"
+    return "16.0.0"