Skip to content

Commit 2837e20

Browse files
committed
Merge pull request #1 from KoMinkyu/master
Jitpack Go
2 parents fca49de + 85297a5 commit 2837e20

12 files changed

Lines changed: 574 additions & 383 deletions

File tree

build.gradle

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@
33
buildscript {
44
repositories {
55
jcenter()
6+
mavenCentral()
67
}
78
dependencies {
89
classpath 'com.android.tools.build:gradle:2.4.0-alpha7'
10+
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' // jitpack
911

1012
// NOTE: Do not place your application dependencies here; they belong
1113
// in the individual module build.gradle files
@@ -15,5 +17,9 @@ buildscript {
1517
allprojects {
1618
repositories {
1719
jcenter()
20+
maven {
21+
url 'https://jitpack.io'
22+
credentials { username authToken }
23+
}
1824
}
1925
}

example/build.gradle

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
22

33
android {
44
compileSdkVersion 25
5-
buildToolsVersion "25.0.2"
5+
buildToolsVersion '25.0.3'
66

77
defaultConfig {
88
applicationId "net.ypresto.androidtranscoder.example"
9-
minSdkVersion 18
9+
minSdkVersion 21
1010
targetSdkVersion 25
1111
versionCode 1
1212
versionName "1.0"
@@ -17,9 +17,12 @@ android {
1717
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
1818
}
1919
}
20+
dataBinding.enabled true
2021
}
2122

2223
dependencies {
2324
compile project(':lib')
24-
compile 'com.android.support:support-core-utils:24.2.0'
25+
compile 'com.android.support:support-core-utils:25.4.0'
26+
compile 'com.android.support:appcompat-v7:25.4.0'
27+
compile 'com.android.support.constraint:constraint-layout:1.0.2'
2528
}
Lines changed: 26 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,33 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="net.ypresto.androidtranscoder.example">
3+
package="net.ypresto.androidtranscoder.example">
44

5-
<uses-permission
6-
android:name="android.permission.WRITE_EXTERNAL_STORAGE"
7-
android:maxSdkVersion="18" />
5+
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
86

9-
<application
10-
android:allowBackup="true"
11-
android:icon="@drawable/ic_launcher"
12-
android:label="@string/app_name"
13-
android:theme="@style/AppTheme">
14-
<activity
15-
android:name=".TranscoderActivity"
16-
android:label="@string/app_name">
17-
<intent-filter>
18-
<action android:name="android.intent.action.MAIN" />
7+
<application
8+
android:allowBackup="true"
9+
android:icon="@drawable/ic_launcher"
10+
android:label="@string/app_name"
11+
android:theme="@style/AppTheme">
12+
<activity
13+
android:name=".TranscoderActivity"
14+
android:label="@string/app_name">
15+
<intent-filter>
16+
<action android:name="android.intent.action.MAIN" />
17+
<category android:name="android.intent.category.LAUNCHER"/>
18+
</intent-filter>
19+
</activity>
1920

20-
<category android:name="android.intent.category.LAUNCHER" />
21-
</intent-filter>
22-
</activity>
21+
<provider
22+
android:name="android.support.v4.content.FileProvider"
23+
android:authorities="net.ypresto.androidtranscoder.example.fileprovider"
24+
android:exported="false"
25+
android:grantUriPermissions="true">
26+
<meta-data
27+
android:name="android.support.FILE_PROVIDER_PATHS"
28+
android:resource="@xml/file_paths" />
29+
</provider>
2330

24-
<provider
25-
android:name="android.support.v4.content.FileProvider"
26-
android:authorities="net.ypresto.androidtranscoder.example.fileprovider"
27-
android:exported="false"
28-
android:grantUriPermissions="true">
29-
<meta-data
30-
android:name="android.support.FILE_PROVIDER_PATHS"
31-
android:resource="@xml/file_paths" />
32-
</provider>
33-
</application>
31+
</application>
3432

35-
</manifest>
33+
</manifest>
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
package net.ypresto.androidtranscoder.example;
2+
3+
public interface TranscodeInputs {
4+
void onSelectVideoButtonClick();
5+
void onCancelTranscodeButtonClick();
6+
}

0 commit comments

Comments
 (0)