Skip to content

Commit 447328f

Browse files
Upgrade cppwinrt Calculator to 0.81 (#1127)
## Description Upgrade cppwinrt Calculator to 0.81 ### Why Have a Calculator with the latest version ## Screenshots <img width="1810" height="1408" alt="image" src="https://github.com/user-attachments/assets/6e96edb5-431c-4549-83cd-47221791fcc8" /> ###### Microsoft Reviewers: [Open in CodeFlow](https://microsoft.github.io/open-pr/?codeflow=https://github.com/microsoft/react-native-windows-samples/pull/1127)
1 parent 7dd557b commit 447328f

File tree

15 files changed

+6883
-8087
lines changed

15 files changed

+6883
-8087
lines changed

samples/Calculator/cppwinrt/android/app/src/debug/AndroidManifest.xml

Lines changed: 0 additions & 9 deletions
This file was deleted.

samples/Calculator/cppwinrt/android/app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
android:roundIcon="@mipmap/ic_launcher_round"
1010
android:allowBackup="false"
1111
android:theme="@style/AppTheme"
12+
android:usesCleartextTraffic="${usesCleartextTraffic}"
1213
android:supportsRtl="true">
1314
<activity
1415
android:name=".MainActivity"

samples/Calculator/cppwinrt/android/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
buildscript {
22
ext {
3-
buildToolsVersion = "35.0.0"
3+
buildToolsVersion = "36.0.0"
44
minSdkVersion = 24
5-
compileSdkVersion = 35
6-
targetSdkVersion = 35
5+
compileSdkVersion = 36
6+
targetSdkVersion = 36
77
ndkVersion = "27.1.12297006"
88
kotlinVersion = "2.1.20"
99
}

samples/Calculator/cppwinrt/android/gradle.properties

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,8 @@ newArchEnabled=true
3737
# Use this property to enable or disable the Hermes JS engine.
3838
# If set to false, you will be using JSC instead.
3939
hermesEnabled=true
40+
41+
# Use this property to enable edge-to-edge display support.
42+
# This allows your app to draw behind system bars for an immersive UI.
43+
# Note: Only works with ReactActivity and should not be used with custom Activity.
44+
edgeToEdgeEnabled=false

samples/Calculator/cppwinrt/android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

samples/Calculator/cppwinrt/ios/Calculator.xcodeproj/project.pbxproj

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,7 @@
1313
81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; };
1414
/* End PBXBuildFile section */
1515

16-
/* Begin PBXContainerItemProxy section */
17-
00E356F41AD99517003FC87E /* PBXContainerItemProxy */ = {
18-
isa = PBXContainerItemProxy;
19-
containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */;
20-
proxyType = 1;
21-
remoteGlobalIDString = 13B07F861A680F5B00A75B9A;
22-
remoteInfo = Calculator;
23-
};
24-
/* End PBXContainerItemProxy section */
25-
2616
/* Begin PBXFileReference section */
27-
00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
2817
13B07F961A680F5B00A75B9A /* Calculator.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Calculator.app; sourceTree = BUILT_PRODUCTS_DIR; };
2918
13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = Calculator/Images.xcassets; sourceTree = "<group>"; };
3019
13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = Calculator/Info.plist; sourceTree = "<group>"; };
@@ -49,14 +38,6 @@
4938
/* End PBXFrameworksBuildPhase section */
5039

5140
/* Begin PBXGroup section */
52-
00E356F01AD99517003FC87E /* Supporting Files */ = {
53-
isa = PBXGroup;
54-
children = (
55-
00E356F11AD99517003FC87E /* Info.plist */,
56-
);
57-
name = "Supporting Files";
58-
sourceTree = "<group>";
59-
};
6041
13B07FAE1A68108700A75B9A /* Calculator */ = {
6142
isa = PBXGroup;
6243
children = (
@@ -172,13 +153,6 @@
172153
/* End PBXProject section */
173154

174155
/* Begin PBXResourcesBuildPhase section */
175-
00E356EC1AD99517003FC87E /* Resources */ = {
176-
isa = PBXResourcesBuildPhase;
177-
buildActionMask = 2147483647;
178-
files = (
179-
);
180-
runOnlyForDeploymentPostprocessing = 0;
181-
};
182156
13B07F8E1A680F5B00A75B9A /* Resources */ = {
183157
isa = PBXResourcesBuildPhase;
184158
buildActionMask = 2147483647;
@@ -276,14 +250,6 @@
276250
};
277251
/* End PBXSourcesBuildPhase section */
278252

279-
/* Begin PBXTargetDependency section */
280-
00E356F51AD99517003FC87E /* PBXTargetDependency */ = {
281-
isa = PBXTargetDependency;
282-
target = 13B07F861A680F5B00A75B9A /* Calculator */;
283-
targetProxy = 00E356F41AD99517003FC87E /* PBXContainerItemProxy */;
284-
};
285-
/* End PBXTargetDependency section */
286-
287253
/* Begin XCBuildConfiguration section */
288254
13B07F941A680F5B00A75B9A /* Debug */ = {
289255
isa = XCBuildConfiguration;

samples/Calculator/cppwinrt/metro.config.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ const {getDefaultConfig, mergeConfig} = require('@react-native/metro-config');
22

33
const fs = require('fs');
44
const path = require('path');
5-
const exclusionList = require('metro-config/src/defaults/exclusionList');
6-
75
const rnwPath = fs.realpathSync(
86
path.resolve(require.resolve('react-native-windows/package.json'), '..'),
97
);
@@ -20,7 +18,7 @@ const rnwPath = fs.realpathSync(
2018
const config = {
2119
//
2220
resolver: {
23-
blockList: exclusionList([
21+
blockList: [
2422
// This stops "npx @react-native-community/cli run-windows" from causing the metro server to crash if its already running
2523
new RegExp(
2624
`${path.resolve(__dirname, 'windows').replace(/[/\\]/g, '/')}.*`,
@@ -29,7 +27,7 @@ const config = {
2927
new RegExp(`${rnwPath}/build/.*`),
3028
new RegExp(`${rnwPath}/target/.*`),
3129
/.*\.ProjectImports\.zip/,
32-
]),
30+
],
3331
//
3432
},
3533
transformer: {

0 commit comments

Comments
 (0)