Skip to content

Commit 3fb085e

Browse files
NathanWalkerNathanWalker
authored
Merge branch 'main' into scorecard-dependency
2 parents 95b3cf0 + a20a67e commit 3fb085e

File tree

18 files changed

+281
-27
lines changed

18 files changed

+281
-27
lines changed

‎.github/dependabot.yml‎

Lines changed: 196 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,196 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: github-actions
4+
directory: /
5+
schedule:
6+
interval: monthly
7+
8+
- package-ecosystem: npm
9+
directory: /
10+
schedule:
11+
interval: monthly
12+
time: "23:00"
13+
open-pull-requests-limit: 10
14+
ignore:
15+
- dependency-name: "*"
16+
update-types: ["version-update:semver-major"]
17+
18+
- package-ecosystem: npm
19+
directory: /test-app/app/src/main/assets/app
20+
schedule:
21+
interval: monthly
22+
time: "23:00"
23+
open-pull-requests-limit: 10
24+
ignore:
25+
- dependency-name: "*"
26+
update-types: ["version-update:semver-major"]
27+
28+
- package-ecosystem: npm
29+
directory: /test-app/app/src/main/assets/app/tests
30+
schedule:
31+
interval: monthly
32+
time: "23:00"
33+
open-pull-requests-limit: 10
34+
ignore:
35+
- dependency-name: "*"
36+
update-types: ["version-update:semver-major"]
37+
38+
- package-ecosystem: npm
39+
directory: /test-app/app/src/main/assets/app/tns_modules/dummy-package
40+
schedule:
41+
interval: monthly
42+
time: "23:00"
43+
open-pull-requests-limit: 10
44+
ignore:
45+
- dependency-name: "*"
46+
update-types: ["version-update:semver-major"]
47+
48+
- package-ecosystem: npm
49+
directory: /test-app/build-tools/android-metadata-generator
50+
schedule:
51+
interval: monthly
52+
time: "23:00"
53+
open-pull-requests-limit: 10
54+
ignore:
55+
- dependency-name: "*"
56+
update-types: ["version-update:semver-major"]
57+
58+
- package-ecosystem: npm
59+
directory: /test-app/build-tools/jsparser
60+
schedule:
61+
interval: monthly
62+
time: "23:00"
63+
open-pull-requests-limit: 10
64+
ignore:
65+
- dependency-name: "*"
66+
update-types: ["version-update:semver-major"]
67+
68+
- package-ecosystem: npm
69+
directory: /test-app/build-tools/jsparser/tests/cases/mini_app/app
70+
schedule:
71+
interval: monthly
72+
time: "23:00"
73+
open-pull-requests-limit: 10
74+
ignore:
75+
- dependency-name: "*"
76+
update-types: ["version-update:semver-major"]
77+
78+
- package-ecosystem: npm
79+
directory: /test-app/build-tools/jsparser/tests/cases/mini_app/app/tns_modules/component/not_ns_subcomponent
80+
schedule:
81+
interval: monthly
82+
time: "23:00"
83+
open-pull-requests-limit: 10
84+
ignore:
85+
- dependency-name: "*"
86+
update-types: ["version-update:semver-major"]
87+
88+
- package-ecosystem: npm
89+
directory: /test-app/build-tools/jsparser/tests/cases/mini_app/app/tns_modules/component
90+
schedule:
91+
interval: monthly
92+
time: "23:00"
93+
open-pull-requests-limit: 10
94+
ignore:
95+
- dependency-name: "*"
96+
update-types: ["version-update:semver-major"]
97+
98+
- package-ecosystem: npm
99+
directory: /test-app/build-tools/jsparser/tests/cases/mini_app/app/tns_modules/components_collection/component1
100+
schedule:
101+
interval: monthly
102+
time: "23:00"
103+
open-pull-requests-limit: 10
104+
ignore:
105+
- dependency-name: "*"
106+
update-types: ["version-update:semver-major"]
107+
108+
- package-ecosystem: npm
109+
directory: /test-app/build-tools/jsparser/tests/cases/mini_app/app/tns_modules/components_collection/component2
110+
schedule:
111+
interval: monthly
112+
time: "23:00"
113+
open-pull-requests-limit: 10
114+
ignore:
115+
- dependency-name: "*"
116+
update-types: ["version-update:semver-major"]
117+
118+
- package-ecosystem: npm
119+
directory: /test-app/build-tools/jsparser/tests/cases/mini_app/app/tns_modules/components_collection/component2/subcomponent2.1
120+
schedule:
121+
interval: monthly
122+
time: "23:00"
123+
open-pull-requests-limit: 10
124+
ignore:
125+
- dependency-name: "*"
126+
update-types: ["version-update:semver-major"]
127+
128+
- package-ecosystem: npm
129+
directory: /test-app/build-tools/jsparser/tests/cases/mini_app/app/tns_modules/components_collection
130+
schedule:
131+
interval: monthly
132+
time: "23:00"
133+
open-pull-requests-limit: 10
134+
ignore:
135+
- dependency-name: "*"
136+
update-types: ["version-update:semver-major"]
137+
138+
- package-ecosystem: npm
139+
directory: /test-app/build-tools/jsparser/tests/cases/mini_app/app/tns_modules/not_ns_module/not_ns_module_submodule
140+
schedule:
141+
interval: monthly
142+
time: "23:00"
143+
open-pull-requests-limit: 10
144+
ignore:
145+
- dependency-name: "*"
146+
update-types: ["version-update:semver-major"]
147+
148+
- package-ecosystem: npm
149+
directory: /test-app/build-tools/jsparser/tests/cases/mini_app/app/tns_modules/not_ns_module
150+
schedule:
151+
interval: monthly
152+
time: "23:00"
153+
open-pull-requests-limit: 10
154+
ignore:
155+
- dependency-name: "*"
156+
update-types: ["version-update:semver-major"]
157+
158+
- package-ecosystem: npm
159+
directory: /test-app/build-tools/jsparser/tests/cases/mini_app/app/tns_modules
160+
schedule:
161+
interval: monthly
162+
time: "23:00"
163+
open-pull-requests-limit: 10
164+
ignore:
165+
- dependency-name: "*"
166+
update-types: ["version-update:semver-major"]
167+
168+
- package-ecosystem: npm
169+
directory: /test-app/build-tools/jsparser/tests
170+
schedule:
171+
interval: monthly
172+
time: "23:00"
173+
open-pull-requests-limit: 10
174+
ignore:
175+
- dependency-name: "*"
176+
update-types: ["version-update:semver-major"]
177+
178+
- package-ecosystem: npm
179+
directory: /test-app
180+
schedule:
181+
interval: monthly
182+
time: "23:00"
183+
open-pull-requests-limit: 10
184+
ignore:
185+
- dependency-name: "*"
186+
update-types: ["version-update:semver-major"]
187+
188+
- package-ecosystem: npm
189+
directory: /test-app/tools
190+
schedule:
191+
interval: monthly
192+
time: "23:00"
193+
open-pull-requests-limit: 10
194+
ignore:
195+
- dependency-name: "*"
196+
update-types: ["version-update:semver-major"]

‎.github/workflows/npm_release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
env:
99
NPM_TAG: "next"
1010
EMULATOR_NAME: "runtime-emu"
11-
NDK_VERSION: r27
11+
NDK_VERSION: r27d
1212
ANDROID_API: 33
1313
ANDROID_ABI: x86_64
1414
NDK_ARCH: darwin

‎.github/workflows/pull_request.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
env:
55
NPM_TAG: "pr"
66
EMULATOR_NAME: "runtime-emu"
7-
NDK_VERSION: r27
7+
NDK_VERSION: r27d
88
ANDROID_API: 33
99
ANDROID_ABI: x86_64
1010
NDK_ARCH: darwin

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@nativescript/android",
33
"description": "NativeScript for Android using v8",
4-
"version": "8.9.1",
4+
"version": "8.9.2",
55
"repository": {
66
"type": "git",
77
"url": "https://github.com/NativeScript/android.git"
@@ -13,7 +13,7 @@
1313
"v8": "10.3.22.0",
1414
"gradle": "8.14.3",
1515
"gradleAndroid": "8.12.1",
16-
"ndk": "r27",
16+
"ndk": "r27d",
1717
"ndkApiLevel": "21",
1818
"minSdk": "21",
1919
"compileSdk": "35",

‎test-app/app/src/main/assets/app/mainpage.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,4 +71,5 @@ require('./tests/testNativeTimers');
7171
require("./tests/testPostFrameCallback");
7272
require("./tests/console/logTests.js");
7373
require('./tests/testURLImpl.js');
74-
require('./tests/testURLSearchParamsImpl.js');
74+
require('./tests/testURLSearchParamsImpl.js');
75+
require('./tests/testPerformanceNow');

‎test-app/app/src/main/assets/app/tests/testPerformanceNow.js‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
describe('performance.now()', () => {
2+
it('returns increasing high-resolution time', () => {
3+
const t1 = performance.now();
4+
const t2 = performance.now();
5+
expect(typeof t1).toBe('number');
6+
expect(isNaN(t1)).toBe(false);
7+
expect(t2).not.toBeLessThan(t1); // non-decreasing
8+
// Should be relative (well below 1h after startup)
9+
expect(t1).toBeLessThan(60 * 60 * 1000);
10+
});
11+
12+
it('advances over real time', (done) => {
13+
const t1 = performance.now();
14+
setTimeout(() => {
15+
const t2 = performance.now();
16+
// 8ms threshold accounts for timer clamping on some devices
17+
expect(t2 - t1).not.toBeLessThan(8);
18+
done();
19+
}, 10);
20+
});
21+
});

‎test-app/build-tools/android-metadata-generator/src/src/com/telerik/metadata/parsing/kotlin/classes/KotlinClassDescriptor.kt‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ import com.telerik.metadata.parsing.kotlin.metadata.bytecode.BytecodeClassMetada
1515
import com.telerik.metadata.parsing.kotlin.methods.KotlinMethodDescriptor
1616
import com.telerik.metadata.parsing.kotlin.properties.KotlinPropertyDescriptor
1717
import com.telerik.metadata.security.classes.SecuredClassRepository
18+
import org.apache.bcel.classfile.JavaClass
19+
import java.util.*
20+
import java.util.stream.Collectors
1821
import kotlin.metadata.KmClass
1922
import kotlin.metadata.KmProperty
2023
import kotlin.metadata.Visibility
@@ -23,13 +26,6 @@ import kotlin.metadata.jvm.Metadata
2326
import kotlin.metadata.jvm.getterSignature
2427
import kotlin.metadata.jvm.setterSignature
2528
import kotlin.metadata.visibility
26-
import org.apache.bcel.classfile.JavaClass
27-
import java.io.IOException
28-
import java.nio.file.Files
29-
import java.nio.file.Paths
30-
import java.nio.file.StandardOpenOption
31-
import java.util.*
32-
import java.util.stream.Collectors
3329

3430
class KotlinClassDescriptor(nativeClass: JavaClass, private val metadataAnnotation: MetadataAnnotation,
3531
override val isPackagePrivate: Boolean
@@ -62,9 +58,9 @@ class KotlinClassDescriptor(nativeClass: JavaClass, private val metadataAnnotati
6258
fields.add(possibleObjectInstanceField.get())
6359
}
6460

65-
if (metaClass.enumEntries.isNotEmpty()) {
66-
67-
val enumFields = getEnumEntriesAsFields(nativeClass, metaClass.enumEntries)
61+
if (metaClass.kmEnumEntries.isNotEmpty()) {
62+
val enums: Collection<String> = metaClass.kmEnumEntries.map { it.name }
63+
val enumFields = getEnumEntriesAsFields(nativeClass, enums)
6864
fields.addAll(enumFields)
6965
}
7066

‎test-app/gradle.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ ns_default_google_java_format_version = 1.6
3939
ns_default_gson_version = 2.10.1
4040
ns_default_json_version = 20180813
4141
ns_default_junit_version = 4.13.2
42-
ns_default_kotlin_version = 2.0.0
43-
ns_default_kotlinx_metadata_jvm_version = 2.0.0
42+
ns_default_kotlin_version = 2.2.20
43+
ns_default_kotlinx_metadata_jvm_version = 2.2.20
4444
ns_default_mockito_core_version = 3.0.0
4545
ns_default_spotbugs_version = 3.1.12

‎test-app/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
"version": "1.0.0",
55
"private": true,
66
"dependencies": {
7-
"@nativescript/core": "~8.7.0",
8-
"nativescript": "~8.7.0"
7+
"@nativescript/core": "~8.9.0",
8+
"nativescript": "~8.9.0"
99
},
1010
"devDependencies": {}
1111
}

‎test-app/runtime/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ if (useCCache) {
2121
}
2222

2323

24-
def defaultNdkVersion = "27.2.12479018"
24+
def defaultNdkVersion = "27.3.13750724"
2525

2626
def hasNdkVersion = project.hasProperty("ndkVersion")
2727
if (hasNdkVersion) {

0 commit comments

Comments
 (0)