Skip to content

Commit

Permalink
Merge branch 'today-extension' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
神楽坂花火 committed Mar 14, 2020
1 parent d8a17bc commit 91e829b
Show file tree
Hide file tree
Showing 10 changed files with 416 additions and 16 deletions.
16 changes: 16 additions & 0 deletions android/app/src/main/kotlin/com/yaerin/dailypics/MainActivity.kt
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
/*
* Copyright 2019 KagurazakaHanabi<i@yaerin.com>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package com.yaerin.dailypics

import androidx.annotation.NonNull
Expand Down
4 changes: 2 additions & 2 deletions ios/Podfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Uncomment this line to define a global platform for your project
# platform :ios, '9.0'
platform :ios, '10.0'

# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
ENV['COCOAPODS_DISABLE_STATS'] = 'true'
Expand Down Expand Up @@ -35,7 +35,7 @@ end
target 'Runner' do
use_frameworks!
use_modular_headers!

# Flutter Pod

copied_flutter_dir = File.join(__dir__, 'Flutter')
Expand Down
2 changes: 1 addition & 1 deletion ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,6 @@ SPEC CHECKSUMS:
url_launcher_macos: fd7894421cd39320dce5f292fc99ea9270b2a313
url_launcher_web: e5527357f037c87560776e36436bf2b0288b965c

PODFILE CHECKSUM: 1b66dae606f75376c5f2135a8290850eeb09ae83
PODFILE CHECKSUM: a2b0bf7fe93e4e6b732ab20a6fda201dc8a23f90

COCOAPODS: 1.8.4
Loading

0 comments on commit 91e829b

Please sign in to comment.