diff --git a/baRSS/AppHook.m b/baRSS/AppHook.m index 78051df..013b062 100644 --- a/baRSS/AppHook.m +++ b/baRSS/AppHook.m @@ -109,7 +109,8 @@ - (NSPersistentContainer *)persistentContainer { @synchronized (self) { if (_persistentContainer == nil) { - _persistentContainer = [[NSPersistentContainer alloc] initWithName:@"DBv1"]; + NSManagedObjectModel *mom = [NSManagedObjectModel mergedModelFromBundles:nil]; + _persistentContainer = [[NSPersistentContainer alloc] initWithName:@"Library" managedObjectModel:mom]; [_persistentContainer loadPersistentStoresWithCompletionHandler:^(NSPersistentStoreDescription *storeDescription, NSError *error) { if ([error inCaseLog:"Couldn't read NSPersistentContainer"]) abort(); diff --git a/baRSS/DBv1.xcdatamodeld/DBv1.xcdatamodel/contents b/baRSS/DBv1.xcdatamodeld/DBv1.xcdatamodel/contents index a557ea4..bc9008f 100644 --- a/baRSS/DBv1.xcdatamodeld/DBv1.xcdatamodel/contents +++ b/baRSS/DBv1.xcdatamodeld/DBv1.xcdatamodel/contents @@ -1,5 +1,5 @@ - + diff --git a/baRSS/Info.plist b/baRSS/Info.plist index 369dfe4..0a613a0 100644 --- a/baRSS/Info.plist +++ b/baRSS/Info.plist @@ -70,7 +70,7 @@ CFBundleVersion - 14344 + 14360 LSApplicationCategoryType public.app-category.news LSMinimumSystemVersion diff --git a/baRSS/container-migration.plist b/baRSS/container-migration.plist index c8fe2b0..3f54936 100644 --- a/baRSS/container-migration.plist +++ b/baRSS/container-migration.plist @@ -4,7 +4,22 @@ Move - ${ApplicationSupport}/$(PRODUCT_NAME) + + ${ApplicationSupport}/$(PRODUCT_NAME)/DBv1.sqlite + ${ApplicationSupport}/$(PRODUCT_NAME)/Library.sqlite + + + ${ApplicationSupport}/$(PRODUCT_NAME)/DBv1.sqlite-shm + ${ApplicationSupport}/$(PRODUCT_NAME)/Library.sqlite-shm + + + ${ApplicationSupport}/$(PRODUCT_NAME)/DBv1.sqlite-wal + ${ApplicationSupport}/$(PRODUCT_NAME)/Library.sqlite-wal + + + ${ApplicationSupport}/$(PRODUCT_NAME) + ${ApplicationSupport}/$(PRODUCT_NAME)/old_data +