Skip to content

Updated the soruce to compile with newer version of Gradle #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Updated the soruce to compile with newer version of Gradle #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 19
buildToolsVersion "23.0.1"
compileSdkVersion 26
buildToolsVersion '28.0.3'

defaultConfig {
applicationId "com.tesobe.hello_obp"
minSdkVersion 7
targetSdkVersion 19
targetSdkVersion 26
}

buildTypes {
Expand All @@ -19,6 +19,6 @@ android {
}

dependencies {
compile(group: 'oauth.signpost', name: 'signpost-core', version: '1.2.1.2')
compile(group: 'oauth.signpost', name: 'signpost-commonshttp4', version: '1.2.1.2')
implementation(group: 'oauth.signpost', name: 'signpost-core', version: '1.2.1.2')
implementation(group: 'oauth.signpost', name: 'signpost-commonshttp4', version: '1.2.1.2')
}
31 changes: 13 additions & 18 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
Expand Down Expand Up @@ -195,45 +194,41 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.tesobe.hello_obp"
android:versionCode="1"
android:versionName="1.0" >

<uses-sdk
android:minSdkVersion="7"
android:targetSdkVersion="19" />
android:versionName="1.0">

<uses-permission android:name="android.permission.INTERNET" />

<application
android:allowBackup="true"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:theme="@style/AppTheme" >
android:theme="@style/AppTheme">
<activity
android:name="com.tesobe.hello_obp.activity.OAuthActivity"
android:noHistory="true"
android:theme="@android:style/Theme.NoTitleBar" >
android:theme="@android:style/Theme.NoTitleBar">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
android:name="com.tesobe.hello_obp.activity.AuthenticateActivity"
android:noHistory="true"
android:launchMode="singleInstance">
android:launchMode="singleInstance"
android:noHistory="true">
<intent-filter>
<action android:name="android.intent.action.VIEW" />

<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<!-- You will want to set customAppProtocol to something unique to avoid having Android
give the user more than one app to pick from to handle the oauth callback -->
<data android:scheme="@string/customAppProtocol"/>
<category android:name="android.intent.category.BROWSABLE" />
<!-- You will want to set customAppProtocol to something unique to avoid having Android
give the user more than one app to pick from to handle the oauth callback -->
<data android:scheme="@string/customAppProtocol" />
</intent-filter>
</activity>
<activity
android:name="com.tesobe.hello_obp.activity.MainActivity"
android:label="@string/app_name" >
</activity>
android:label="@string/app_name"></activity>
</application>

</manifest>
4 changes: 3 additions & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,16 @@
buildscript {
repositories {
jcenter()
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:1.5.0'
classpath 'com.android.tools.build:gradle:3.2.1'
}
}

allprojects {
repositories {
jcenter()
google()
}
}
12 changes: 6 additions & 6 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Wed Oct 21 11:34:03 PDT 2015
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip
#Tue Jan 15 14:48:06 EET 2019
distributionBase=GRADLE_USER_HOME
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are some "^M" at the end of line.

distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip