Skip to content

Commit

Permalink
Merge pull request #181 from sparcs-kaist/#180-feat-channel-talk
Browse files Browse the repository at this point in the history
Add Channel Talk
  • Loading branch information
sboh1214 authored Aug 14, 2024
2 parents 42d492b + f1bba1b commit f557a3b
Show file tree
Hide file tree
Showing 22 changed files with 1,180 additions and 1,015 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ on:
branches: [main]

env:
FLUTTER_VERSION: "3"
FLUTTER_VERSION: "3.22.3"
JAVA_VERSION: "17"

jobs:
build-android:
name: Build Android
runs-on: macos-latest
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Set up Java
Expand All @@ -25,7 +25,7 @@ jobs:
uses: subosito/flutter-action@v2
with:
flutter-version: ${{ env.FLUTTER_VERSION }}
channel: "stable"
# channel: "stable"
- name: Create key.properties
run: |
echo "storeFile=../ci.jks" > android/key.properties
Expand All @@ -48,7 +48,7 @@ jobs:
uses: subosito/flutter-action@v2
with:
flutter-version: ${{ env.FLUTTER_VERSION }}
channel: "stable"
# channel: "stable"
- uses: actions/cache@v3
with:
path: Pods
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Coverage
on: [push]

env:
FLUTTER_VERSION: "3"
FLUTTER_VERSION: "3.22.3"

jobs:
coverage:
Expand All @@ -15,7 +15,7 @@ jobs:
uses: subosito/flutter-action@v2
with:
flutter-version: ${{ env.FLUTTER_VERSION }}
channel: "stable"
# channel: "stable"
- name: Install lcov
run: sudo apt-get install -y lcov
- name: Install dependencies
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
branches: [main]

env:
FLUTTER_VERSION: "3"
FLUTTER_VERSION: "3.22.3"

jobs:
lint:
Expand All @@ -19,7 +19,7 @@ jobs:
uses: subosito/flutter-action@v2
with:
flutter-version: ${{ env.FLUTTER_VERSION }}
channel: "stable"
# channel: "stable"
- name: Install dependencies
run: flutter pub get
- name: Format
Expand Down
8 changes: 4 additions & 4 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ if (keystorePropertiesFile.exists()) {
android {
namespace 'org.sparcs.otlplus'

compileSdk 34
compileSdk rootProject.ext.compileSdkVersion

sourceSets {
main.java.srcDirs += 'src/main/kotlin'
Expand All @@ -44,7 +44,7 @@ android {
defaultConfig {
applicationId "org.sparcs.otlplus"
minSdkVersion 21
targetSdkVersion 34
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand Down Expand Up @@ -83,6 +83,6 @@ flutter {

dependencies {
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test:runner:1.5.2'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
androidTestImplementation 'androidx.test:runner:1.6.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
}
9 changes: 9 additions & 0 deletions android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
android:maxSdkVersion="28"/>
<uses-permission
android:name="android.permission.READ_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
<application
android:name="${applicationName}"
android:label="OTL"
Expand All @@ -31,6 +32,14 @@
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
<service
android:name="com.kuku.channel_talk_flutter.PushInterceptService"
android:exported="true"
>
<intent-filter>
<action android:name="com.google.firebase.MESSAGING_EVENT"/>
</intent-filter>
</service>
<!-- Don't delete the meta-data below.
This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
<meta-data
Expand Down
6 changes: 6 additions & 0 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@ allprojects {
}
}

ext {
compileSdkVersion = 34
targetSdkVersion = 34
appCompatVersion = "1.7.0"
}

rootProject.buildDir = '../build'
subprojects {
project.buildDir = "${rootProject.buildDir}/${project.name}"
Expand Down
1 change: 1 addition & 0 deletions ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ flutter_ios_podfile_setup
target 'Runner' do
use_frameworks!
use_modular_headers!
pod 'ChannelIOSDK', podspec: 'https://mobile-static.channel.io/ios/11.7.3/xcframework.podspec'

flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
end
Expand Down
Loading

0 comments on commit f557a3b

Please sign in to comment.