Skip to content

Commit

Permalink
Upgrade to AS 3.0, remove MoPub
Browse files Browse the repository at this point in the history
  • Loading branch information
ccjeng committed Nov 11, 2017
1 parent 4ca0fed commit 3fb0b38
Show file tree
Hide file tree
Showing 11 changed files with 109 additions and 111 deletions.
15 changes: 1 addition & 14 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

123 changes: 71 additions & 52 deletions app/app.iml

Large diffs are not rendered by default.

38 changes: 14 additions & 24 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 25
buildToolsVersion '25.0.0'
compileSdkVersion 27
buildToolsVersion '26.0.2'
defaultConfig {
applicationId "com.oddsoft.buddhavoice2"
minSdkVersion 16
targetSdkVersion 21
versionCode 41
versionName '2.5.6.090317BV'
versionCode 42
versionName '2.5.7.111117BV'
}
buildTypes {
release {
Expand All @@ -26,29 +26,19 @@ android {

dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
compile 'com.android.support:appcompat-v7:25.3.1'
compile 'com.android.support:design:25.3.1'
compile 'com.google.android.gms:play-services-analytics:11.0.4'
compile 'com.google.firebase:firebase-core:11.0.4'
compile 'com.google.firebase:firebase-ads:11.0.4'
releaseCompile 'com.google.firebase:firebase-crash:11.0.4'
compile 'com.android.support:appcompat-v7:27.0.0'
compile 'com.android.support:design:27.0.0'
compile 'com.google.android.gms:play-services-analytics:11.6.0'
compile 'com.google.firebase:firebase-core:11.6.0'
compile 'com.google.firebase:firebase-ads:11.6.0'
releaseCompile 'com.google.firebase:firebase-crash:11.6.0'
compile('com.mikepenz:aboutlibraries:5.9.4@aar') {
transitive = true
}
// For banners
compile('com.mopub:mopub-sdk-banner:4.16.1@aar') {
transitive = true
}
// For native static (images).
compile('com.mopub:mopub-sdk-native-static:4.16.1@aar') {
transitive = true
}
compile 'com.google.ads.mediation:mopub:4.15.0.0'
compile 'com.facebook.android:audience-network-sdk:4.25.0'
compile 'com.google.ads.mediation:facebook:4.25.0.0'
//compile files('src/main/libs/libAdapterSDKMoPub.jar')
//compile files('src/main/libs/FacebookAdapter.jar')
compile 'com.jakewharton:butterknife:7.0.1'
compile 'com.facebook.android:audience-network-sdk:4.26.1'
compile 'com.google.ads.mediation:facebook:4.26.1.0'
compile 'com.jakewharton:butterknife:8.8.1'
annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
compile 'me.majiajie:swipe-back:1.0.0-alpha2'
}

Expand Down
1 change: 1 addition & 0 deletions app/release/output.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":42},"path":"app-release.apk","properties":{"packageId":"com.oddsoft.buddhavoice2","split":"","minSdkVersion":"16"}}]
Original file line number Diff line number Diff line change
Expand Up @@ -27,29 +27,29 @@
import com.oddsoft.buddhavoice2.utils.Constant;
import com.oddsoft.buddhavoice2.view.base.BaseActivity;

import butterknife.Bind;
import butterknife.BindView;
import butterknife.ButterKnife;

public class MainActivity extends BaseActivity {
private static final String TAG = "BuddhaVoice";

@Bind(R.id.navigation)
NavigationView navigation;

@Bind(R.id.drawerlayout)
@BindView(R.id.drawerlayout)
DrawerLayout drawerLayout;

@Bind(R.id.tabs)
@BindView(R.id.navigation)
NavigationView navigation;

@BindView(R.id.tabs)
TabLayout tabs;

@Bind(R.id.pager)
@BindView(R.id.pager)
ViewPager pager;

private AdView adView;
private Analytics ga;
private ActionBarDrawerToggle actionBarDrawerToggle;

@Bind(R.id.toolbar)
@BindView(R.id.toolbar)
Toolbar toolbar;

@Override
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/oddsoft/buddhavoice2/view/Prefs.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@

import com.oddsoft.buddhavoice2.R;

import butterknife.Bind;
import butterknife.BindView;
import butterknife.ButterKnife;

public class Prefs extends AppCompatActivity {

@Bind(R.id.toolbar)
@BindView(R.id.toolbar)
Toolbar toolbar;

protected void onCreate(Bundle savedInstanceState) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,20 +28,20 @@
import com.oddsoft.buddhavoice2.utils.Constant;
import com.oddsoft.buddhavoice2.view.base.BaseActivity;

import butterknife.Bind;
import butterknife.BindView;
import butterknife.ButterKnife;

public class VoiceListener extends BaseActivity {
private static final String TAG = "VoiceListener";
private MediaPlayer mp;

@Bind(R.id.songcontent)
@BindView(R.id.songcontent)
TextView songcontentTextView;

@Bind(R.id.songinfo)
@BindView(R.id.songinfo)
TextView songinfoTextView;

@Bind(R.id.main)
@BindView(R.id.main)
NestedScrollView mainScollView;

private String[] songInfo, songInfo1;
Expand All @@ -53,10 +53,10 @@ public class VoiceListener extends BaseActivity {
private AdView adView;
private Analytics ga;

@Bind(R.id.toolbar)
@BindView(R.id.toolbar)
Toolbar toolbar;

@Bind(R.id.progress_wheel)
@BindView(R.id.progress_wheel)
ProgressBar progressWheel;

@Override
Expand Down
Binary file removed app/src/main/libs/FacebookAdapter.jar
Binary file not shown.
Binary file removed app/src/main/libs/libAdapterSDKMoPub.jar
Binary file not shown.
7 changes: 4 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@
buildscript {
repositories {
jcenter()
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.3.3'
classpath 'com.android.tools.build:gradle:3.0.0'
classpath 'com.google.gms:google-services:3.0.0'
classpath 'com.jakewharton:butterknife-gradle-plugin:8.8.1'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand All @@ -16,7 +18,6 @@ buildscript {
allprojects {
repositories {
jcenter()
// includes the MoPub SDK and AVID library
maven { url "https://s3.amazonaws.com/moat-sdk-builds" }
google()
}
}
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Sun Mar 26 18:49:11 CST 2017
#Fri Nov 10 22:04:49 CST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

0 comments on commit 3fb0b38

Please sign in to comment.