Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/lib/ios.js
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ export class IOS {
await fs.ensureDir(path.join(DEST_IOS, 'include', libDir));
const libFiles = await fs.readdir(fullLibDir);
for (const libFile of libFiles) {
if (libFile.endsWith('.h') && libFile !== 'APSUtility.h') { // for whatever reason APSUtility.h seems not to get copied as part of framework?
if (libFile.endsWith('.h')) {
await fs.move(path.join(DEST_IOS, 'include', libFile), path.join(DEST_IOS, 'include', libDir, libFile));
}
}
Expand Down
4 changes: 0 additions & 4 deletions build/lib/test/test.js
Original file line number Diff line number Diff line change
Expand Up @@ -303,10 +303,6 @@ async function addTiAppProperties() {

// Not so smart but this should work...
tiapp_xml_string.split(/\r?\n/).forEach(line => {
// replace generated guid with appc analytics app guid
if (line.indexOf('\t<guid>') >= 0) {
line = '\t<guid>1c4b748c-7c16-4df1-bd5c-4ffe6240286e</guid>';
}
if (line.indexOf('<application android:icon="@mipmap/ic_launcher"/>') > 0) {
line = '';
}
Expand Down
3 changes: 1 addition & 2 deletions common/Resources/ti.internal/bootstrap.loader.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@
* display UI to the end-user before the "app.js" gets loaded. This feature is the CommonJS
* equivalent to Titanium's Android module onAppCreate() or iOS module load() features.
*
* Use-Cases:
* - Automatically kick-off analytics functionality on app startup.
* Use-Case:
* - Ensure "Google Play Services" is installed/updated on app startup on Android.
*/

Expand Down
2 changes: 1 addition & 1 deletion common/Resources/ti.internal/kernel/titanium.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export default function bootstrap(global, kroll) {
// On iOS, really we just need to set up the TopTiModule binding stuff, then hang lazy property getters for the top-level modules like UI, API, etc
const Ti = kroll.binding('topTi');
const modules = [
'Accelerometer', 'Analytics', 'App', 'API', 'Calendar', 'Codec', 'Contacts',
'Accelerometer', 'App', 'API', 'Calendar', 'Codec', 'Contacts',
'Database', 'Filesystem', 'Geolocation', 'Gesture', 'Locale', 'Media',
'Network', 'Platform', 'Stream', 'Utils', 'UI', 'WatchSession', 'XML'
];
Expand Down
34 changes: 0 additions & 34 deletions iphone/Classes/AnalyticsModule.h

This file was deleted.

55 changes: 0 additions & 55 deletions iphone/Classes/AnalyticsModule.m

This file was deleted.

5 changes: 0 additions & 5 deletions iphone/Classes/AppModule.m
Original file line number Diff line number Diff line change
Expand Up @@ -585,11 +585,6 @@ - (id)sessionId
return [[TiApp app] sessionId];
}

- (id)analytics
{
return @(NO);
}

- (NSNumber *)keyboardVisible
{
return NUMBOOL([[[TiApp app] controller] keyboardVisible]);
Expand Down
20 changes: 2 additions & 18 deletions iphone/TitaniumKit/TitaniumKit.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
B106A6FD24535CB800B1305E /* JSValue+Addons.h in Headers */ = {isa = PBXBuildFile; fileRef = B106A6FB24535CB800B1305E /* JSValue+Addons.h */; settings = {ATTRIBUTES = (Public, ); }; };
B106A6FE24535CB800B1305E /* JSValue+Addons.m in Sources */ = {isa = PBXBuildFile; fileRef = B106A6FC24535CB800B1305E /* JSValue+Addons.m */; };
B10E8D502408559300578E8F /* APSHTTPClient.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = B10E8D4F2408559300578E8F /* APSHTTPClient.xcframework */; };
B10E8D5824085E1E00578E8F /* APSAnalytics.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = B10E8D5724085E1E00578E8F /* APSAnalytics.xcframework */; };
B70ABB8424B79C9C0007D07A /* KrollPromise.h in Headers */ = {isa = PBXBuildFile; fileRef = B70ABB8324B79C9C0007D07A /* KrollPromise.h */; settings = {ATTRIBUTES = (Public, ); }; };
B70ABB8624B79DCF0007D07A /* KrollPromise.m in Sources */ = {isa = PBXBuildFile; fileRef = B70ABB8524B79DCF0007D07A /* KrollPromise.m */; };
B7385F50246593B7007DB1F2 /* ScriptModule.m in Sources */ = {isa = PBXBuildFile; fileRef = B7385F4F246593B7007DB1F2 /* ScriptModule.m */; };
Expand Down Expand Up @@ -179,7 +178,6 @@
DB258DAD1F097697000D0D8D /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DB258DAC1F097697000D0D8D /* Foundation.framework */; };
DB258DB81F09770C000D0D8D /* TiUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = DB258DB61F09770C000D0D8D /* TiUtils.h */; settings = {ATTRIBUTES = (Public, ); }; };
DB258DB91F09770C000D0D8D /* TiUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = DB258DB71F09770C000D0D8D /* TiUtils.m */; };
DB3908652075228900AE31EC /* APSAnalytics.h in Headers */ = {isa = PBXBuildFile; fileRef = DB39085F2075228900AE31EC /* APSAnalytics.h */; settings = {ATTRIBUTES = (Public, ); }; };
DB3908662075228900AE31EC /* APSHTTPResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = DB3908602075228900AE31EC /* APSHTTPResponse.h */; settings = {ATTRIBUTES = (Public, ); }; };
DB3908672075228900AE31EC /* APSHTTPRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = DB3908612075228900AE31EC /* APSHTTPRequest.h */; settings = {ATTRIBUTES = (Public, ); }; };
DB3908682075228900AE31EC /* APSHTTPClient.h in Headers */ = {isa = PBXBuildFile; fileRef = DB3908622075228900AE31EC /* APSHTTPClient.h */; settings = {ATTRIBUTES = (Public, ); }; };
Expand All @@ -197,7 +195,6 @@
B106A6FB24535CB800B1305E /* JSValue+Addons.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "JSValue+Addons.h"; sourceTree = "<group>"; };
B106A6FC24535CB800B1305E /* JSValue+Addons.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "JSValue+Addons.m"; sourceTree = "<group>"; };
B10E8D4F2408559300578E8F /* APSHTTPClient.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = APSHTTPClient.xcframework; path = TitaniumKit/Libraries/APSHTTPClient/APSHTTPClient.xcframework; sourceTree = "<group>"; };
B10E8D5724085E1E00578E8F /* APSAnalytics.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = APSAnalytics.xcframework; path = TitaniumKit/Libraries/APSAnalytics/APSAnalytics.xcframework; sourceTree = "<group>"; };
B70ABB8324B79C9C0007D07A /* KrollPromise.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KrollPromise.h; sourceTree = "<group>"; };
B70ABB8524B79DCF0007D07A /* KrollPromise.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = KrollPromise.m; sourceTree = "<group>"; };
B7385F4F246593B7007DB1F2 /* ScriptModule.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ScriptModule.m; sourceTree = "<group>"; };
Expand Down Expand Up @@ -351,7 +348,6 @@
DB258DAC1F097697000D0D8D /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
DB258DB61F09770C000D0D8D /* TiUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TiUtils.h; sourceTree = "<group>"; };
DB258DB71F09770C000D0D8D /* TiUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TiUtils.m; sourceTree = "<group>"; };
DB39085F2075228900AE31EC /* APSAnalytics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APSAnalytics.h; sourceTree = "<group>"; };
DB3908602075228900AE31EC /* APSHTTPResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APSHTTPResponse.h; sourceTree = "<group>"; };
DB3908612075228900AE31EC /* APSHTTPRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APSHTTPRequest.h; sourceTree = "<group>"; };
DB3908622075228900AE31EC /* APSHTTPClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APSHTTPClient.h; sourceTree = "<group>"; };
Expand All @@ -370,7 +366,6 @@
DB258DAD1F097697000D0D8D /* Foundation.framework in Frameworks */,
DB258DAB1F097692000D0D8D /* JavaScriptCore.framework in Frameworks */,
B10E8D502408559300578E8F /* APSHTTPClient.xcframework in Frameworks */,
B10E8D5824085E1E00578E8F /* APSAnalytics.xcframework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -596,7 +591,6 @@
DB258DA91F097691000D0D8D /* Frameworks */ = {
isa = PBXGroup;
children = (
B10E8D5724085E1E00578E8F /* APSAnalytics.xcframework */,
B10E8D4F2408559300578E8F /* APSHTTPClient.xcframework */,
DB258DAC1F097697000D0D8D /* Foundation.framework */,
DB258DAA1F097692000D0D8D /* JavaScriptCore.framework */,
Expand All @@ -607,20 +601,11 @@
DB39085B2075228900AE31EC /* Libraries */ = {
isa = PBXGroup;
children = (
DB39085C2075228900AE31EC /* APSAnalytics */,
DB39085D2075228900AE31EC /* APSHTTPClient */,
);
path = Libraries;
sourceTree = "<group>";
};
DB39085C2075228900AE31EC /* APSAnalytics */ = {
isa = PBXGroup;
children = (
DB39085F2075228900AE31EC /* APSAnalytics.h */,
);
path = APSAnalytics;
sourceTree = "<group>";
};
DB39085D2075228900AE31EC /* APSHTTPClient */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -652,7 +637,6 @@
buildActionMask = 2147483647;
files = (
DB1596622075461400292B19 /* SBJSON.h in Headers */,
DB3908652075228900AE31EC /* APSAnalytics.h in Headers */,
DB15FCAC1F0A86D400A82C45 /* TiLogServer.h in Headers */,
DBE66A36210F92FD00095F1E /* KrollWrapper.h in Headers */,
DB3908682075228900AE31EC /* APSHTTPClient.h in Headers */,
Expand Down Expand Up @@ -1065,12 +1049,12 @@
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/TitaniumKit",
"$(PROJECT_DIR)/TitaniumKit/Libraries/APSAnalytics",
"$(PROJECT_DIR)/TitaniumKit/Libraries/APSHTTPClient",
);
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = "-DTARGET_OS_IPHONE";
OTHER_LDFLAGS = (
"-ObjC",
"$(inherited)",
"-lsqlite3",
"-lz",
Expand Down Expand Up @@ -1122,11 +1106,11 @@
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/TitaniumKit",
"$(PROJECT_DIR)/TitaniumKit/Libraries/APSAnalytics",
"$(PROJECT_DIR)/TitaniumKit/Libraries/APSHTTPClient",
);
OTHER_CFLAGS = "-DTARGET_OS_IPHONE";
OTHER_LDFLAGS = (
"-ObjC",
"$(inherited)",
"-lsqlite3",
"-lz",
Expand Down
Loading
Loading