chore: ci

NativeScript · Aug 7, 2024 · a663b87 · a663b87
1 parent 659d76b
commit a663b87
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 20 deletions.
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -202,9 +202,8 @@ jobs:
           registry-url: "https://registry.npmjs.org"
 
     - name: Generate Version
-      working-directory: packages/canvas
       run: |
-          echo NPM_VERSION=$(node -e "console.log(require('./package.json').version);")-$NPM_TAG-$(date +"%m-%d-%Y")-$GITHUB_RUN_ID >> $GITHUB_ENV
+          echo NPM_VERSION=$(node -e "console.log(require('./packages/canvas/package.json').version);")-$NPM_TAG-$(date +"%m-%d-%Y")-$GITHUB_RUN_ID >> $GITHUB_ENV
 
     - name: Bump canvas
       working-directory: packages/canvas

diff --git a/packages/canvas-svg/src-native/android/.idea/deploymentTargetSelector.xml b/packages/canvas-svg/src-native/android/.idea/deploymentTargetSelector.xml
diff --git a/packages/canvas-svg/src-native/android/.idea/kotlinc.xml b/packages/canvas-svg/src-native/android/.idea/kotlinc.xml
diff --git a/packages/canvas-svg/src-native/android/app/build.gradle b/packages/canvas-svg/src-native/android/app/build.gradle
@@ -9,7 +9,7 @@ android {
 
     defaultConfig {
         applicationId "org.nativescript.canvas.svgdemo"
-        minSdk 17
+        minSdk 21
         targetSdk 34
         versionCode 1
         versionName "1.0"

diff --git a/packages/canvas-svg/src-native/android/build.gradle b/packages/canvas-svg/src-native/android/build.gradle
@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '7.4.2' apply false
-    id 'com.android.library' version '7.4.2' apply false
-    id 'org.jetbrains.kotlin.android' version '1.8.0' apply false
+    id 'com.android.application' version '8.5.0' apply false
+    id 'com.android.library' version '8.5.0' apply false
+    id 'org.jetbrains.kotlin.android' version '1.9.0' apply false
 }
diff --git a/packages/canvas-svg/src-native/android/canvassvg/build.gradle b/packages/canvas-svg/src-native/android/canvassvg/build.gradle
@@ -5,11 +5,11 @@ plugins {
 
 android {
 	namespace 'org.nativescript.canvas.svg'
-	compileSdk 33
+	compileSdk 34
 
 	defaultConfig {
 		minSdk 17
-		targetSdk 33
+		targetSdk 34
 
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 		consumerProguardFiles "consumer-rules.pro"
@@ -22,22 +22,22 @@ android {
 		}
 	}
 	compileOptions {
-		sourceCompatibility JavaVersion.VERSION_1_8
-		targetCompatibility JavaVersion.VERSION_1_8
+		sourceCompatibility JavaVersion.VERSION_17
+		targetCompatibility JavaVersion.VERSION_17
 	}
 	kotlinOptions {
-		jvmTarget = '1.8'
+		jvmTarget = '17'
 	}
 
 	ndkVersion "23.2.8568313"
 }
 
 dependencies {
 
-	implementation 'androidx.core:core-ktx:1.7.0'
-	implementation 'androidx.appcompat:appcompat:1.6.1'
+	implementation 'androidx.core:core-ktx:1.13.1'
+	implementation 'androidx.appcompat:appcompat:1.7.0'
 //    implementation 'com.google.android.material:material:1.11.0'
 	testImplementation 'junit:junit:4.13.2'
-	androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-	androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+	androidTestImplementation 'androidx.test.ext:junit:1.2.1'
+	androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
 }
diff --git a/packages/canvas-svg/src-native/android/gradle/wrapper/gradle-wrapper.properties b/packages/canvas-svg/src-native/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Mar 18 03:16:59 AST 2024
+#Wed Aug 07 04:06:17 AST 2024
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/tools/scripts/build-svg-android.sh b/tools/scripts/build-svg-android.sh
@@ -40,5 +40,5 @@ fi
 
 
 
- RUSTFLAGS="$RUSTFLAGS" cargo +nightly build -Z build-std='std,panic_abort' --release -Z build-std-features=panic_immediate_abort --target $TARGET $EXTRA_ARGS -p canvas-svg
+ RUSTFLAGS="$RUSTFLAGS" cargo +nightly build -Z build-std='std,panic_abort' -Z build-std-features=panic_immediate_abort --target $TARGET $EXTRA_ARGS -p canvas-svg