Skip to content

Commit 604cd5b

Browse files
dalehenrichdalehenrich
authored
Merge pull request #6 from SeasideSt/master
pick up last commit for 1.3
2 parents a3aca8e + 43c850d commit 604cd5b

3 files changed

Lines changed: 36 additions & 32 deletions

File tree

‎repository/Grease-Core.package/GRPackage.class/instance/resolveWith..st‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@ resolveWith: aDictionary
1313
aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo40-') ifAbsent: [
1414
"try -Pharo50-"
1515
aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo50-') ifAbsent: [
16-
"try -Squeak-"
17-
aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Squeak-') ifAbsent: [
18-
"try -Squeak5-"
19-
aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Squeak5-') ifAbsent: [
20-
self error: self name printString , ' depends on unknown package ' , each printString ] ] ] ] ] ] ] ] ]
16+
"try -Pharo60-"
17+
aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo60-') ifAbsent: [
18+
"try -Squeak-"
19+
aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Squeak-') ifAbsent: [
20+
"try -Squeak5-"
21+
aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Squeak5-') ifAbsent: [
22+
self error: self name printString , ' depends on unknown package ' , each printString ] ] ] ] ] ] ] ] ] ]

‎repository/Grease-Core.package/GRPackage.class/methodProperties.json‎

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,29 @@
11
{
2-
"class" : {
3-
"grPackages" : "JohanBrichau 12/15/2013 18:27",
4-
"greaseCore" : "pmm 9/12/2013 16:00" },
52
"instance" : {
6-
"addDependenciesTo:" : "lr 9/5/2009 18:35",
7-
"addDependency:" : "merged 10/20/2008 09:33",
8-
"allDependencies" : "lr 2/17/2010 15:18",
93
"dependencies" : "jf 3/15/2009 17:00",
10-
"description" : "merged 10/20/2008 09:23",
11-
"description:" : "lr 10/25/2009 11:26",
12-
"greaseUrl" : "pmm 9/12/2013 15:57",
4+
"license:" : "obi 10/8/2009 07:51",
135
"initialize" : "lr 2/17/2010 15:06",
14-
"isLGPL" : "lr 10/25/2009 15:19",
15-
"isMIT" : "lr 10/25/2009 15:19",
166
"license" : "lr 2/10/2010 11:18",
17-
"license:" : "obi 10/8/2009 07:51",
187
"name" : "lr 2/17/2010 15:18",
8+
"description:" : "lr 10/25/2009 11:26",
9+
"seasideUrl" : "pmm 9/12/2013 15:58",
10+
"allDependencies" : "lr 2/17/2010 15:18",
11+
"isLGPL" : "lr 10/25/2009 15:19",
12+
"seasideLGPLUrl" : "pmm 9/12/2013 15:59",
13+
"greaseUrl" : "pmm 9/12/2013 15:57",
1914
"name:" : "lr 10/25/2009 11:26",
20-
"printOn:" : "merged 10/20/2008 09:24",
21-
"resolveWith:" : "TravisCI 8/23/2016 10:48",
15+
"description" : "merged 10/20/2008 09:23",
2216
"seasideAddonsUrl" : "pmm 9/12/2013 15:59",
23-
"seasideLGPLUrl" : "pmm 9/12/2013 15:59",
24-
"seasideUrl" : "pmm 9/12/2013 15:58",
17+
"resolveWith:" : "JohanBrichau 5/26/2017 15:56",
18+
"addDependency:" : "merged 10/20/2008 09:33",
2519
"url" : "lr 2/10/2010 11:18",
26-
"url:" : "lr 2/17/2010 15:18" } }
20+
"printOn:" : "merged 10/20/2008 09:24",
21+
"addDependenciesTo:" : "lr 9/5/2009 18:35",
22+
"url:" : "lr 2/17/2010 15:18",
23+
"isMIT" : "lr 10/25/2009 15:19"
24+
},
25+
"class" : {
26+
"greaseCore" : "pmm 9/12/2013 16:00",
27+
"grPackages" : "JohanBrichau 12/15/2013 18:27"
28+
}
29+
}

‎repository/Grease-Core.package/GRPackage.class/properties.json‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
{
2-
"category" : "Grease-Core",
3-
"classinstvars" : [
4-
],
5-
"classvars" : [
6-
],
72
"commentStamp" : "pmm 9/14/2013 15:53",
3+
"super" : "GRObject",
4+
"category" : "Grease-Core",
5+
"classinstvars" : [ ],
6+
"pools" : [ ],
7+
"classvars" : [ ],
88
"instvars" : [
99
"name",
1010
"description",
1111
"dependencies",
1212
"license",
13-
"url" ],
13+
"url"
14+
],
1415
"name" : "GRPackage",
15-
"pools" : [
16-
],
17-
"super" : "GRObject",
18-
"type" : "normal" }
16+
"type" : "normal"
17+
}

0 commit comments

Comments
 (0)