Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: platform version logic #1206

Merged
merged 2 commits into from
Dec 2, 2021
Merged
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
1 change: 0 additions & 1 deletion Cordova.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ Pod::Spec.new do |s|
s.platform = :ios, "11.0"
s.source = relSource
s.requires_arc = true
s.preserve_paths = 'CordovaLib/VERSION'
s.frameworks = 'Foundation'
s.source_files = 'CordovaLib/**/*.{h,m}'
s.public_header_files = 'CordovaLib/include/**/*.h'
Expand Down
1 change: 0 additions & 1 deletion CordovaLib/VERSION

This file was deleted.

4 changes: 2 additions & 2 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ let package = Package(
.target(
name: "Cordova",
path: "CordovaLib/",
exclude: ["VERSION", "cordova.js", "Cordova/Cordova.h", "Cordova/Info.plist"],
exclude: ["cordova.js", "Cordova/Cordova.h", "Cordova/Info.plist"],
cSettings: [
.headerSearchPath("Classes/Private")
.headerSearchPath("Classes/Private")
]
)
]
Expand Down
9 changes: 1 addition & 8 deletions lib/Api.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,7 @@

/* jslint node: true */

/**
* @todo update coho to update this line.
* @todo use `package.json` instead but first
* figure out how this fit in with the platform-centered workflow structure.
* This workflow would not have the `package.json` file.
*/
// Coho updates this line
const VERSION = '7.0.0-dev';
const VERSION = require('../package.json').version;

const fs = require('fs-extra');
const path = require('path');
Expand Down
2 changes: 1 addition & 1 deletion lib/create.js
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ class ProjectCreator {
// like it should).
fs.symlinkSync(cordovaLibPathSrc, cordovaLibPathDest);
} else {
for (const p of ['include', 'Classes', 'VERSION', 'CordovaLib.xcodeproj/project.pbxproj']) {
for (const p of ['include', 'Classes', 'CordovaLib.xcodeproj/project.pbxproj']) {
fs.copySync(path.join(cordovaLibPathSrc, p), path.join(cordovaLibPathDest, p));
}
}
Expand Down