Merge remote-tracking branch 'upstream/master' into extension/bluetoo…

…thle Change-Id: I1aabfb8dcae45f395dee5ae1220ec32fc86b3d2a
patryk84a · Oct 17, 2024 · 53faef6 · 53faef6
2 parents f182a9d + 63e3f29
commit 53faef6
Show file tree

Hide file tree

Showing 457 changed files with 14,936 additions and 5,185 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE/default.md → .github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE/default.md → .github/PULL_REQUEST_TEMPLATE.md
diff --git a/appinventor/AICompanionApp.xcconfig.sample b/appinventor/AICompanionApp.xcconfig.sample
@@ -2,3 +2,4 @@
 // Copyright 2023 MIT, All rights reserved.
 
 DEVELOPMENT_TEAM = "Your Team ID here"
+BUNDLE_IDENTIFIER = "Your custom package here"
diff --git a/appinventor/AICompanionApp.xcodeproj/project.pbxproj b/appinventor/AICompanionApp.xcodeproj/project.pbxproj
@@ -9,6 +9,7 @@
 /* Begin PBXBuildFile section */
 		062ACEF81F705CD200FA31AD /* Pods_AICompanionApp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 062ACEF71F705CD200FA31AD /* Pods_AICompanionApp.framework */; };
 		062ACEF91F705D3F00FA31AD /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 062ACEF31F705B5C00FA31AD /* CoreData.framework */; settings = {ATTRIBUTES = (Required, ); }; };
+		062B743D2BC07549002E221F /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 062B743C2BC07549002E221F /* PrivacyInfo.xcprivacy */; };
 		063D678F1FA0CEB1002E907D /* SchemeKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 063D678E1FA0CEB1002E907D /* SchemeKit.framework */; };
 		063D67901FA0CEB1002E907D /* SchemeKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 063D678E1FA0CEB1002E907D /* SchemeKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		063D67921FA0CEB1002E907D /* AIComponentKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 063D67911FA0CEB1002E907D /* AIComponentKit.framework */; };
@@ -76,6 +77,7 @@
 		062ACEF31F705B5C00FA31AD /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; };
 		062ACEF71F705CD200FA31AD /* Pods_AICompanionApp.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Pods_AICompanionApp.framework; path = "../../../../../Library/Developer/Xcode/DerivedData/AIComponentKit-czkmnbdmmcqhgpfhwphanoynsffy/Build/Products/Debug-iphonesimulator/Pods_AICompanionApp.framework"; sourceTree = "<group>"; };
 		062ACEFA1F705D7700FA31AD /* AIComponentKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AIComponentKit.framework; path = "build/Debug-iphoneos/AIComponentKit.framework"; sourceTree = "<group>"; };
+		062B743C2BC07549002E221F /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = PrivacyInfo.xcprivacy; path = aicompanionapp/src/PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
 		063D678E1FA0CEB1002E907D /* SchemeKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = SchemeKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		063D67911FA0CEB1002E907D /* AIComponentKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = AIComponentKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		06463EF81D95956800B23DCD /* AICompanionApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = AICompanionApp.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -162,6 +164,7 @@
 		06463EEF1D95956800B23DCD = {
 			isa = PBXGroup;
 			children = (
+				062B743C2BC07549002E221F /* PrivacyInfo.xcprivacy */,
 				06647F4A29CA1EB90009F29C /* AICompanionApp.xcconfig */,
 				066FE95625AC9E7300C6193B /* Settings.bundle */,
 				063D67911FA0CEB1002E907D /* AIComponentKit.framework */,
@@ -394,6 +397,7 @@
 				06B216181DBC5F1B000B3366 /* Instructions.png in Resources */,
 				06B216171DBC5F1B000B3366 /* connectwQR.png in Resources */,
 				06463F061D95956800B23DCD /* LaunchScreen.storyboard in Resources */,
+				062B743D2BC07549002E221F /* PrivacyInfo.xcprivacy in Resources */,
 				06B216161DBC5F1B000B3366 /* connectwCode.png in Resources */,
 				06B2161A1DBC5F1B000B3366 /* Title.png in Resources */,
 				06B216191DBC5F1B000B3366 /* mooning.png in Resources */,
@@ -810,7 +814,7 @@
 				INFOPLIST_FILE = aicompanionapp/src/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = edu.mit.appinventor.aicompanion3;
+				PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_IDENTIFIER)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "9c96ca04-1d70-4a2b-bb01-28f545b35d28";
 				PROVISIONING_PROFILE_SPECIFIER = "MIT App Inventor Development";
@@ -832,7 +836,7 @@
 				INFOPLIST_FILE = aicompanionapp/src/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = edu.mit.appinventor.aicompanion3;
+				PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_IDENTIFIER)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "9c96ca04-1d70-4a2b-bb01-28f545b35d28";
 				PROVISIONING_PROFILE_SPECIFIER = "MIT App Inventor Production";
@@ -850,7 +854,7 @@
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				INFOPLIST_FILE = aicompanionapp/tests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = edu.mit.appinventor.aicompanion3Tests;
+				PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_IDENTIFIER)Tests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/AICompanionApp.app/AICompanionApp";
@@ -865,7 +869,7 @@
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				INFOPLIST_FILE = aicompanionapp/tests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = edu.mit.appinventor.aicompanion3Tests;
+				PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_IDENTIFIER)Tests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/AICompanionApp.app/AICompanionApp";
@@ -879,7 +883,7 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
 				INFOPLIST_FILE = aicompanionapp/uitests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited)";
-				PRODUCT_BUNDLE_IDENTIFIER = edu.mit.appinventor.aicompanion3UITests;
+				PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_IDENTIFIER)UITests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TEST_TARGET_NAME = AICompanionApp;
@@ -893,7 +897,7 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
 				INFOPLIST_FILE = aicompanionapp/uitests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited)";
-				PRODUCT_BUNDLE_IDENTIFIER = edu.mit.appinventor.aicompanion3UITests;
+				PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_IDENTIFIER)UITests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TEST_TARGET_NAME = AICompanionApp;

diff --git a/appinventor/AIComponentKit.xcodeproj/project.pbxproj b/appinventor/AIComponentKit.xcodeproj/project.pbxproj
@@ -45,6 +45,7 @@
 		0623BBF02476291D00FEB2B6 /* TinyDBTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0623BBEF2476291D00FEB2B6 /* TinyDBTests.swift */; };
 		0624072F245340E1005E5BFC /* dictionaries.yail in Resources */ = {isa = PBXBuildFile; fileRef = 0624072E245340E1005E5BFC /* dictionaries.yail */; };
 		062832981DBE95A7009605D5 /* Layout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 062832971DBE95A7009605D5 /* Layout.swift */; };
+		062B743B2BC06AD9002E221F /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 062B743A2BC06AD9002E221F /* PrivacyInfo.xcprivacy */; };
 		0633F360297D0AD700C3C3E9 /* tr.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0633F35F297D0AD700C3C3E9 /* tr.pb.swift */; };
 		0633F362297D0B1400C3C3E9 /* Translator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0633F361297D0B1400C3C3E9 /* Translator.swift */; };
 		064326B9289602770001297F /* Spreadsheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 064326B8289602770001297F /* Spreadsheet.swift */; };
@@ -302,6 +303,7 @@
 		0623BBEF2476291D00FEB2B6 /* TinyDBTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TinyDBTests.swift; sourceTree = "<group>"; };
 		0624072E245340E1005E5BFC /* dictionaries.yail */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = dictionaries.yail; sourceTree = "<group>"; };
 		062832971DBE95A7009605D5 /* Layout.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Layout.swift; sourceTree = "<group>"; };
+		062B743A2BC06AD9002E221F /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = PrivacyInfo.xcprivacy; path = "components-ios/src/PrivacyInfo.xcprivacy"; sourceTree = "<group>"; };
 		0633F35F297D0AD700C3C3E9 /* tr.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = tr.pb.swift; sourceTree = "<group>"; };
 		0633F361297D0B1400C3C3E9 /* Translator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Translator.swift; sourceTree = "<group>"; };
 		064326B8289602770001297F /* Spreadsheet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Spreadsheet.swift; sourceTree = "<group>"; };
@@ -938,6 +940,7 @@
 		06EF8CDF1D8CE2F6009FB227 = {
 			isa = PBXGroup;
 			children = (
+				062B743A2BC06AD9002E221F /* PrivacyInfo.xcprivacy */,
 				061CEC0D297B47B400C2879B /* install-webrtc.sh */,
 				0618A2851D8CF4EE0013A191 /* components-ios/src */,
 				0618A2901D8CF4EE0013A191 /* components-ios/tests */,
@@ -1171,6 +1174,7 @@
 				DED066B21FE0846F009C8165 /* webview-error.html in Resources */,
 				061DC7B3223C396000539213 /* classic_button.pressed.png in Resources */,
 				DE6D5A0C20FE9E8D003B2C67 /* unchecked.svg in Resources */,
+				062B743B2BC06AD9002E221F /* PrivacyInfo.xcprivacy in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

diff --git a/appinventor/aicompanionapp/src/PrivacyInfo.xcprivacy b/appinventor/aicompanionapp/src/PrivacyInfo.xcprivacy
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>NSPrivacyAccessedAPITypes</key>
+	<array>
+		<dict>
+			<key>NSPrivacyAccessedAPIType</key>
+			<string>NSPrivacyAccessedAPICategoryUserDefaults</string>
+			<key>NSPrivacyAccessedAPITypeReasons</key>
+			<array>
+				<string>CA92.1</string>
+			</array>
+		</dict>
+	</array>
+	<key>NSPrivacyTracking</key>
+	<false/>
+</dict>
+</plist>
diff --git a/appinventor/aiplayapp/youngandroidproject/project.properties b/appinventor/aiplayapp/youngandroidproject/project.properties
@@ -7,14 +7,14 @@ icon=AI2Companion-Icon.png
 # The Version code is an integer. Each new version of an App uploaded
 # to the Play Store must have a version greater then the version in
 # the store
-versioncode=13327000
+versioncode=13327200
 # The Version Name is displayed to the user and can contain numbers
 # and letters. It generally should be congruent to the Version Code
 # Terms used by AI2:
 # Version code XYZ turns into X.YZ. ai2 indicates a Companion for AI2
 # and an optional "zx1" indicates it has internal Zebra Crossing (QR
 # Code) scanning builtin.
-versionname=2.70
+versionname=2.72
 useslocation=False
 androidminsdk=7
 actionbar=true

diff --git a/appinventor/appengine/build.xml b/appinventor/appengine/build.xml
@@ -282,7 +282,7 @@
     <copy todir="${build.war.dir}/WEB-INF/lib" file="${gwt.sdk}/gwt-servlet.jar" />
     <copy todir="${build.war.dir}/WEB-INF/lib" file="${gwt.sdk}/gwt-servlet-deps.jar" />
     <!-- Protocol Buffers -->
-    <copy todir="${build.war.dir}/WEB-INF/lib" file="${lib.dir}/protobuf/protobuf-java-3.0.0.jar" />
+    <copy todir="${build.war.dir}/WEB-INF/lib" file="${lib.dir}/protobuf/protobuf-java-4.28.1.jar" />
     <!-- OWASP -->
     <copy todir="${build.war.dir}/WEB-INF/lib" file="${lib.dir}/owasp/owasp-java-html-sanitizer-20160628.1.jar" />
     <!-- Add any additional server libs that need to be copied -->
@@ -419,7 +419,7 @@
     <pathelement location="${lib.dir}/gcs/google-api-services-storage-v1-rev91-1.22.0.jar" />
     <pathelement location="${lib.dir}/gcs/httpclient-4.0.1.jar" />
     <pathelement location="${lib.dir}/gcs/joda-time-2.6.jar" />
-    <pathelement location="${lib.dir}/protobuf/protobuf-java-3.0.0.jar" />
+    <pathelement location="${lib.dir}/protobuf/protobuf-java-4.28.1.jar" />
     <pathelement location="${gwt.sdk}/gwt-servlet.jar" />
     <pathelement location="${gwt.sdk}/gwt-user.jar"/>
     <pathelement location="${appengine.sdk}/appengine-api-1.0-sdk-2.0.19.jar" />
@@ -634,6 +634,8 @@
       <arg value="${build.extra.dir}"/>
       <arg line="${client.flags} ${client.module}"/>
     </java>
+    <copy todir="${build.war.dir}/ode"
+          file="${appinventor.dir}/appengine/extra/cdnok.js" />
   </target>
 
   <target name="devmode"

diff --git a/appinventor/appengine/extra/cdnok.js b/appinventor/appengine/extra/cdnok.js
@@ -0,0 +1,7 @@
+function cdnok() {
+  var block = document.getElementById("odeblock");
+  if (block) {
+    block.remove();
+  }
+}
+cdnok();
diff --git a/appinventor/appengine/src/com/google/appinventor/client/Images.java b/appinventor/appengine/src/com/google/appinventor/client/Images.java
@@ -26,7 +26,7 @@ public interface Images extends Resources {
   ImageResource codiVert();
 
   /**
-   * App Inventor Logo
+   * App Inventor Logo 
    * {@link Ode#createWelcomeDialog(boolean)}
    */
   @Source("com/google/appinventor/images/appinvlogo-32.png")
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,3 +2,4 @@
		// Copyright 2023 MIT, All rights reserved.

		DEVELOPMENT_TEAM = "Your Team ID here"
		BUNDLE_IDENTIFIER = "Your custom package here"