Merge pull request #21 from zucks/update-gradle

update libraries version
zucks · Dec 28, 2018 · d307a68 · d307a68
2 parents 8dffacf + db4e8d0
commit d307a68
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 13 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.3"
+    compileSdkVersion 28
+    buildToolsVersion '28.0.3'
 
     defaultConfig {
         applicationId "net.zucks.zucksadnetworksdk.sample.android"
         minSdkVersion 16
-        targetSdkVersion 25
+        targetSdkVersion 28
         versionCode 14
         versionName "1.6.1"
     }
@@ -19,12 +19,22 @@ android {
     }
 }
 
+repositories {
+    maven {
+        url 'https://github.com/zucks/ZucksAdNetworkSDK-Maven/raw/master/'
+    }
+}
+
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'net.zucks:zucks-ad-network-sdk:4.6.1'
+
     // Google Play Services を追加
-    compile 'com.android.support:appcompat-v7:25.3.1'
-    compile 'com.google.android.gms:play-services-base:10.2.6'
-    compile 'com.android.support.constraint:constraint-layout:1.0.2'
-    compile 'com.squareup.picasso:picasso:2.5.2'
-    testCompile 'junit:junit:4.12'
+    implementation 'com.google.android.gms:play-services-ads-identifier:16.0.0'
+
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'com.android.support:support-v4:28.0.0'
+    implementation 'com.android.support:exifinterface:28.0.0'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    implementation 'com.squareup.picasso:picasso:2.71828'
+    testImplementation 'junit:junit:4.12'
 }
diff --git a/app/libs/ZucksAdNetworkSDK-4.6.1.jar b/app/libs/ZucksAdNetworkSDK-4.6.1.jar
diff --git a/app/src/main/java/net/zucks/zucksadnetworksdk/sample/android/NativeAdActivity.java b/app/src/main/java/net/zucks/zucksadnetworksdk/sample/android/NativeAdActivity.java
@@ -36,7 +36,7 @@ public void onLoadAd(final NativeAd nativeAd) {
                 ((TextView) itemView.findViewById(R.id.text_body)).setText(nativeAd.bodyText);
                 ((TextView) itemView.findViewById(R.id.text_advertiser_name)).setText(nativeAd.advertiserName);
                 ((TextView) itemView.findViewById(R.id.text_product_name)).setText(nativeAd.productName);
-                Picasso.with(NativeAdActivity.this).load(nativeAd.imageSrc).fit().centerCrop()
+                Picasso.get().load(nativeAd.imageSrc).fit().centerCrop()
                         .into((ImageView) itemView.findViewById(R.id.image_main));
                 Button linkButton = ((Button) itemView.findViewById(R.id.button_link));
                 linkButton.setText(nativeAd.linkButtonText);

diff --git a/build.gradle b/build.gradle
@@ -3,9 +3,10 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:3.2.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -15,6 +16,7 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        google()
     }
 }
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon May 29 11:09:24 JST 2017
+#Thu Dec 27 19:27:08 JST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip